diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ae0a983..1de5d7d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -23,10 +23,6 @@ updates:
           - "io.quarkiverse:*"
           - "io.quarkiverse.*:*"
     ignore:
-      # We require JDK 11, so we don't need "-jdk8"
-      - dependency-name: "org.bsc.maven:maven-processor-plugin"
-        # Apparently patterns using wildcards are not supported here. Hopefully this will last until they drop these silly -jdk8 packages.
-        versions: ["5.0-jdk8", "5.1-jdk8", "5.2-jdk8", "5.3-jdk8", "5.4-jdk8", "5.5-jdk8", "5.6-jdk8", "5.7-jdk8", "5.8-jdk8", "5.9-jdk8"]
       # Releases too often, it's annoying
       - dependency-name: "org.assertj:*"
         update-types: ["version-update:semver-patch"]
diff --git a/README.md b/README.md
index 1192f44..dcbeae0 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,13 @@ It is the new home for the `quarkus-hibernate-search-orm-elasticsearch-aws` exte
 
 Quarkus Hibernate Search Extras provides different version streams for different versions of Quarkus.
 
-| Quarkus    | Quarkus Hibernate Search Extras | Documentation                                                                                                  |
-|------------|---------------------------------|----------------------------------------------------------------------------------------------------------------|
-| 2.x        | 1.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/1.x/index.html) |
-| 3.0, 3.1   | 2.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/2.x/index.html) |
-| 3.2 to 3.6 | 3.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/3.x/index.html) |
-| 3.7+       | 4.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/dev/index.html) |
+| Quarkus     | Quarkus Hibernate Search Extras | Documentation                                                                                                  |
+|-------------|---------------------------------|----------------------------------------------------------------------------------------------------------------|
+| 2.x         | 1.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/1.x/index.html) |
+| 3.0, 3.1    | 2.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/2.x/index.html) |
+| 3.2 to 3.6  | 3.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/3.x/index.html) |
+| 3.7 to 3.15 | 4.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/4.x/index.html) |
+| 3.16+       | 5.x                             | [Documentation](https://quarkiverse.github.io/quarkiverse-docs/quarkus-hibernate-search-extras/dev/index.html) |
 
 
 Use the latest version of the corresponding stream, [the list of versions is available on Maven Central](https://search.maven.org/artifact/io.quarkiverse.hibernatesearchextras/quarkus-hibernate-search-orm-elasticsearch-aws).
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
index 55d4322..1dc123d 100644
--- a/docs/modules/ROOT/pages/includes/attributes.adoc
+++ b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,4 +1,4 @@
-:quarkus-version: 3.13.0
+:quarkus-version: 3.16.0
 :quarkus-hibernate-search-extras-version: 4.1.0
 
 :quarkus-org-url: https://github.com/quarkusio
diff --git a/hibernate-search-orm-elasticsearch-aws/runtime/pom.xml b/hibernate-search-orm-elasticsearch-aws/runtime/pom.xml
index abc19dc..fef5e94 100644
--- a/hibernate-search-orm-elasticsearch-aws/runtime/pom.xml
+++ b/hibernate-search-orm-elasticsearch-aws/runtime/pom.xml
@@ -71,35 +71,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <version>${maven-processor-plugin.version}</version>
-                <executions>
-                    <!-- Run annotation processors on quarkus-amazon-common,
-                         just to generate the necessary metadata/documentation for AwsCredentialsProviderConfig,
-                         so that it will get embedded in our own documentation. -->
-                    <execution>
-                        <id>process-quarkus-amazon-common</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <addCompileSourceRoots>false</addCompileSourceRoots>
-                            <includes>io/quarkus/amazon/**/*.java</includes>
-                            <processSourceArtifacts>io.quarkiverse.amazonservices:quarkus-amazon-common:${quarkus-amazon-services.version}</processSourceArtifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.quarkus</groupId>
-                        <artifactId>quarkus-extension-processor</artifactId>
-                        <version>${quarkus.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
diff --git a/hibernate-search-orm-elasticsearch-aws/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/aws/runtime/HibernateSearchOrmElasticsearchAwsRuntimeConfigPersistenceUnit.java b/hibernate-search-orm-elasticsearch-aws/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/aws/runtime/HibernateSearchOrmElasticsearchAwsRuntimeConfigPersistenceUnit.java
index 21cdc44..f59c756 100644
--- a/hibernate-search-orm-elasticsearch-aws/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/aws/runtime/HibernateSearchOrmElasticsearchAwsRuntimeConfigPersistenceUnit.java
+++ b/hibernate-search-orm-elasticsearch-aws/runtime/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/aws/runtime/HibernateSearchOrmElasticsearchAwsRuntimeConfigPersistenceUnit.java
@@ -3,7 +3,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import io.quarkus.amazon.common.runtime.AwsCredentialsProviderConfig;
+import io.quarkiverse.amazon.common.runtime.AwsCredentialsProviderConfig;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.smallrye.config.WithName;
diff --git a/pom.xml b/pom.xml
index 402e620..7fe7eae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,8 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.version>3.15.1</quarkus.version>
-        <maven-processor-plugin.version>5.1</maven-processor-plugin.version>
-        <quarkus-amazon-services.version>2.18.1</quarkus-amazon-services.version>
+        <quarkus.version>3.16.0</quarkus.version>
+        <quarkus-amazon-services.version>3.0.1</quarkus-amazon-services.version>
         <assertj.version>3.26.0</assertj.version>
         <wiremock.version>2.27.2</wiremock.version>
         <wiremock-maven-plugin.version>7.3.0</wiremock-maven-plugin.version>