diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index cef557fb..88957f87 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -18,7 +18,7 @@ jobs:
           ref: development   # Force checkout of the dev branch
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
index 1d0c4fcc..3827c93f 100644
--- a/.github/workflows/pull_requests.yml
+++ b/.github/workflows/pull_requests.yml
@@ -23,21 +23,21 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: maven
 
       - if: github.base_ref == 'main' || github.ref_name == 'main'
-        name: Start Infinispan Server Latest Version
+        name: Start Infinispan Server Latest Stable Version
         run: |
-          docker run -d -p 11222:11222 -e USER="admin" -e PASS="password" quay.io/infinispan/server:15.2
+          docker run -d -p 11222:11222 -e USER="admin" -e PASS="password" quay.io/infinispan/server:16.0
           # Wait for server to startup
           curl --fail --silent --show-error --retry-all-errors --retry 240 --retry-delay 1 http://localhost:11222/rest/v2/container/health/status > /dev/null
 
       - if: github.base_ref == 'development' || github.ref_name == 'development'
-        name: Start Infinispan Server Latest Version
+        name: Start Infinispan Server Latest Dev Version
         run: |
           docker run -d -p 11222:11222 -e USER="admin" -e PASS="password" quay.io/infinispan-test/server:main
           # Wait for server to startup
diff --git a/infinispan-embedded/cache-alias/pom.xml b/infinispan-embedded/cache-alias/pom.xml
index f36a648c..9e939719 100644
--- a/infinispan-embedded/cache-alias/pom.xml
+++ b/infinispan-embedded/cache-alias/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>infinispan-simple-tutorials-embedded-cache-alias</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/cache-distributed/pom.xml b/infinispan-embedded/cache-distributed/pom.xml
index 65123fc3..f5a357f6 100644
--- a/infinispan-embedded/cache-distributed/pom.xml
+++ b/infinispan-embedded/cache-distributed/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>infinispan-simple-tutorials-distributed</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/cache-invalidated/pom.xml b/infinispan-embedded/cache-invalidated/pom.xml
index 5f5c2787..4996fa13 100644
--- a/infinispan-embedded/cache-invalidated/pom.xml
+++ b/infinispan-embedded/cache-invalidated/pom.xml
@@ -4,7 +4,7 @@
 <artifactId>infinispan-simple-tutorials-invalidation-mode</artifactId>
 <parent>
     <relativePath>../../pom.xml</relativePath>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.0.1</version>
     <groupId>org.infinispan.tutorial.simple</groupId>
     <artifactId>infinispan-simple-tutorials</artifactId>
 </parent>
diff --git a/infinispan-embedded/cache-replicated/pom.xml b/infinispan-embedded/cache-replicated/pom.xml
index 55f5f985..5a2b399e 100644
--- a/infinispan-embedded/cache-replicated/pom.xml
+++ b/infinispan-embedded/cache-replicated/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>infinispan-simple-tutorials-replicated</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/clusterexec/pom.xml b/infinispan-embedded/clusterexec/pom.xml
index 8dbddf6d..d87f83ab 100644
--- a/infinispan-embedded/clusterexec/pom.xml
+++ b/infinispan-embedded/clusterexec/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>infinispan-simple-tutorials-clusterexec</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/counter/pom.xml b/infinispan-embedded/counter/pom.xml
index 73667b25..1775d66a 100644
--- a/infinispan-embedded/counter/pom.xml
+++ b/infinispan-embedded/counter/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>infinispan-simple-tutorials-counter</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/functional/pom.xml b/infinispan-embedded/functional/pom.xml
index e1fd05d1..63535121 100644
--- a/infinispan-embedded/functional/pom.xml
+++ b/infinispan-embedded/functional/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-functional</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/jcache/pom.xml b/infinispan-embedded/jcache/pom.xml
index dc46ea86..c36be721 100644
--- a/infinispan-embedded/jcache/pom.xml
+++ b/infinispan-embedded/jcache/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-jcache</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/kubernetes/pom.xml b/infinispan-embedded/kubernetes/pom.xml
index 2facb988..8db095b7 100644
--- a/infinispan-embedded/kubernetes/pom.xml
+++ b/infinispan-embedded/kubernetes/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>infinispan-simple-tutorials-kubernetes</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/listeners/pom.xml b/infinispan-embedded/listeners/pom.xml
index 9604cf0d..610cec62 100644
--- a/infinispan-embedded/listeners/pom.xml
+++ b/infinispan-embedded/listeners/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-listen</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/lock/pom.xml b/infinispan-embedded/lock/pom.xml
index 0231efba..a72fbf9c 100644
--- a/infinispan-embedded/lock/pom.xml
+++ b/infinispan-embedded/lock/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-lock</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/map/pom.xml b/infinispan-embedded/map/pom.xml
index 91f82050..65c58768 100644
--- a/infinispan-embedded/map/pom.xml
+++ b/infinispan-embedded/map/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-map</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/metrics/pom.xml b/infinispan-embedded/metrics/pom.xml
index 06a164e0..e6aeec8f 100644
--- a/infinispan-embedded/metrics/pom.xml
+++ b/infinispan-embedded/metrics/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/infinispan-embedded/multimap/pom.xml b/infinispan-embedded/multimap/pom.xml
index c38ca4d2..e3fa5b09 100644
--- a/infinispan-embedded/multimap/pom.xml
+++ b/infinispan-embedded/multimap/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-multimap</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/query-programmatic-index/pom.xml b/infinispan-embedded/query-programmatic-index/pom.xml
index ebd2d5b6..42627c28 100644
--- a/infinispan-embedded/query-programmatic-index/pom.xml
+++ b/infinispan-embedded/query-programmatic-index/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-query-programmatic-index</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
@@ -33,20 +33,6 @@
                     </arguments>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <basedir/>
-                    <mainOutputDirectory/>
-                    <mojoStatusPath/>
-                    <outputDirectory/>
-                    <projectArtifact/>
-                    <source>21</source>
-                    <target>21</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/infinispan-embedded/query/pom.xml b/infinispan-embedded/query/pom.xml
index 7045abf3..47c6fe0f 100644
--- a/infinispan-embedded/query/pom.xml
+++ b/infinispan-embedded/query/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-query</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/security/pom.xml b/infinispan-embedded/security/pom.xml
index c8c164c8..95029646 100644
--- a/infinispan-embedded/security/pom.xml
+++ b/infinispan-embedded/security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/infinispan-embedded/streams/pom.xml b/infinispan-embedded/streams/pom.xml
index d292035f..6ee22a1c 100644
--- a/infinispan-embedded/streams/pom.xml
+++ b/infinispan-embedded/streams/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-streams</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-embedded/transactions/pom.xml b/infinispan-embedded/transactions/pom.xml
index f58ed6cd..efde7284 100644
--- a/infinispan-embedded/transactions/pom.xml
+++ b/infinispan-embedded/transactions/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-tx</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/cache-admin-api/pom.xml b/infinispan-remote/cache-admin-api/pom.xml
index 87a26836..ff174b0e 100644
--- a/infinispan-remote/cache-admin-api/pom.xml
+++ b/infinispan-remote/cache-admin-api/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-admin</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/cache-alias/pom.xml b/infinispan-remote/cache-alias/pom.xml
index 289bdbca..9c96e836 100644
--- a/infinispan-remote/cache-alias/pom.xml
+++ b/infinispan-remote/cache-alias/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-cache-alias</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/cache/pom.xml b/infinispan-remote/cache/pom.xml
index db44568b..56cbde6e 100644
--- a/infinispan-remote/cache/pom.xml
+++ b/infinispan-remote/cache/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/connect-to-infinispan-server/pom.xml b/infinispan-remote/connect-to-infinispan-server/pom.xml
index 961f9979..f9fef857 100644
--- a/infinispan-remote/connect-to-infinispan-server/pom.xml
+++ b/infinispan-remote/connect-to-infinispan-server/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>connect-to-infinispan-server</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/continuous-query/pom.xml b/infinispan-remote/continuous-query/pom.xml
index b7069379..17be6092 100644
--- a/infinispan-remote/continuous-query/pom.xml
+++ b/infinispan-remote/continuous-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>infinispan-simple-tutorials</artifactId>
         <groupId>org.infinispan.tutorial.simple</groupId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/infinispan-remote/counter/pom.xml b/infinispan-remote/counter/pom.xml
index e4853b7d..99564814 100644
--- a/infinispan-remote/counter/pom.xml
+++ b/infinispan-remote/counter/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-counter</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/cross-site-replication/docker-compose/docker-compose.yaml b/infinispan-remote/cross-site-replication/docker-compose/docker-compose.yaml
index 41429bc1..038688b5 100644
--- a/infinispan-remote/cross-site-replication/docker-compose/docker-compose.yaml
+++ b/infinispan-remote/cross-site-replication/docker-compose/docker-compose.yaml
@@ -5,7 +5,7 @@ networks:
     driver: bridge
 services:
   infinispan-server-lon-1:
-    image: quay.io/infinispan-test/server-main
+    image: quay.io/infinispan/server:16.0
     ports:
       - "11222:11222"
     container_name: ispn-lon-1
@@ -16,7 +16,7 @@ services:
       - mynetwork
 #    command: -c infinispan-xsite.xml -Dinfinispan.site.name=LON -Djgroups.mcast_port=46656
   infinispan-server-lon-2:
-    image: quay.io/infinispan/server:15.2
+    image: quay.io/infinispan/server:16.0
     ports:
       - "11221:11222"
     container_name: ispn-lon-2
@@ -27,7 +27,7 @@ services:
       - mynetwork
 #    command: -c infinispan-xsite.xml -Dinfinispan.site.name=LON -Djgroups.mcast_port=46656
 #  infinispan-server-nyc-1:
-#    image: quay.io/infinispan/server:15.0
+#    image: quay.io/infinispan/server:16.0
 #    ports:
 #      - "31222:11222"
 #    container_name: ispn-nyc-1
diff --git a/infinispan-remote/cross-site-replication/pom.xml b/infinispan-remote/cross-site-replication/pom.xml
index a8624c96..820cb9a8 100644
--- a/infinispan-remote/cross-site-replication/pom.xml
+++ b/infinispan-remote/cross-site-replication/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>infinispan-simple-tutorials</artifactId>
         <groupId>org.infinispan.tutorial.simple</groupId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/infinispan-remote/encoding/pom.xml b/infinispan-remote/encoding/pom.xml
index 2c24ef83..8e9342a7 100644
--- a/infinispan-remote/encoding/pom.xml
+++ b/infinispan-remote/encoding/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-encoding</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/junit5/pom.xml b/infinispan-remote/junit5/pom.xml
index b6e95c88..cdef2377 100644
--- a/infinispan-remote/junit5/pom.xml
+++ b/infinispan-remote/junit5/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-junit5</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/listeners/pom.xml b/infinispan-remote/listeners/pom.xml
index cbd109a9..a3ef82b2 100644
--- a/infinispan-remote/listeners/pom.xml
+++ b/infinispan-remote/listeners/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-listen</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/multimap/pom.xml b/infinispan-remote/multimap/pom.xml
index 957ce923..e1bd7fb1 100644
--- a/infinispan-remote/multimap/pom.xml
+++ b/infinispan-remote/multimap/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-multimap</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/near-cache/pom.xml b/infinispan-remote/near-cache/pom.xml
index 34551f8a..0b21cfd4 100644
--- a/infinispan-remote/near-cache/pom.xml
+++ b/infinispan-remote/near-cache/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-near-cache</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/opentelemetry/pom.xml b/infinispan-remote/opentelemetry/pom.xml
index 3f5f84f2..542a6566 100644
--- a/infinispan-remote/opentelemetry/pom.xml
+++ b/infinispan-remote/opentelemetry/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>infinispan-simple-tutorials</artifactId>
         <groupId>org.infinispan.tutorial.simple</groupId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/infinispan-remote/per-cache-configuration/pom.xml b/infinispan-remote/per-cache-configuration/pom.xml
index 76996988..c24a3cc0 100644
--- a/infinispan-remote/per-cache-configuration/pom.xml
+++ b/infinispan-remote/per-cache-configuration/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-onaccess</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/persistence/sql-store/pom.xml b/infinispan-remote/persistence/sql-store/pom.xml
index 9c901955..fa7bbd35 100644
--- a/infinispan-remote/persistence/sql-store/pom.xml
+++ b/infinispan-remote/persistence/sql-store/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-persistence</artifactId>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/programmatic-protostream-marshalling/pom.xml b/infinispan-remote/programmatic-protostream-marshalling/pom.xml
index 56af4202..b5dbd351 100644
--- a/infinispan-remote/programmatic-protostream-marshalling/pom.xml
+++ b/infinispan-remote/programmatic-protostream-marshalling/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-programmatic-marshalling</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/query/pom.xml b/infinispan-remote/query/pom.xml
index 2fc6c3ab..97fa3463 100644
--- a/infinispan-remote/query/pom.xml
+++ b/infinispan-remote/query/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-query</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/reactive-api/pom.xml b/infinispan-remote/reactive-api/pom.xml
index 1098e2d0..c4b032c0 100644
--- a/infinispan-remote/reactive-api/pom.xml
+++ b/infinispan-remote/reactive-api/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-reactive</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/redis-client/pom.xml b/infinispan-remote/redis-client/pom.xml
index f6a788e9..e4718177 100644
--- a/infinispan-remote/redis-client/pom.xml
+++ b/infinispan-remote/redis-client/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-redis-client</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/reverse-proxy-infinispan/docker-compose.yml b/infinispan-remote/reverse-proxy-infinispan/docker-compose.yml
index 59e8a10a..99d69abd 100644
--- a/infinispan-remote/reverse-proxy-infinispan/docker-compose.yml
+++ b/infinispan-remote/reverse-proxy-infinispan/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   infinispan:
-    image: quay.io/infinispan-test/server:main
+    image: quay.io/infinispan/server:16.0
     container_name: infinispan
     environment:
       USER: admin
diff --git a/infinispan-remote/security/secured-cache/pom.xml b/infinispan-remote/security/secured-cache/pom.xml
index 9092e491..1f4aa389 100644
--- a/infinispan-remote/security/secured-cache/pom.xml
+++ b/infinispan-remote/security/secured-cache/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-secured</artifactId>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/security/tls-authorization/pom.xml b/infinispan-remote/security/tls-authorization/pom.xml
index edbe3a33..a411cd3a 100644
--- a/infinispan-remote/security/tls-authorization/pom.xml
+++ b/infinispan-remote/security/tls-authorization/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-security-tls-authorization</artifactId>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/infinispan-remote/spatial-queries/pom.xml b/infinispan-remote/spatial-queries/pom.xml
index 118833ca..a9bd2959 100644
--- a/infinispan-remote/spatial-queries/pom.xml
+++ b/infinispan-remote/spatial-queries/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>infinispan-simple-tutorials</artifactId>
         <groupId>org.infinispan.tutorial.simple</groupId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>infinispan-simple-tutorials-spatial-queries</artifactId>
diff --git a/infinispan-remote/tasks/pom.xml b/infinispan-remote/tasks/pom.xml
index eeb5c31f..b20c8617 100644
--- a/infinispan-remote/tasks/pom.xml
+++ b/infinispan-remote/tasks/pom.xml
@@ -4,7 +4,7 @@
    <artifactId>infinispan-simple-tutorials-server-tasks</artifactId>
    <parent>
       <relativePath>../../pom.xml</relativePath>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.0.1</version>
       <groupId>org.infinispan.tutorial.simple</groupId>
       <artifactId>infinispan-simple-tutorials</artifactId>
    </parent>
diff --git a/infinispan-remote/transactions/pom.xml b/infinispan-remote/transactions/pom.xml
index 46418d77..5a4e4bd4 100644
--- a/infinispan-remote/transactions/pom.xml
+++ b/infinispan-remote/transactions/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>infinispan-simple-tutorials-remote-tx</artifactId>
     <parent>
         <relativePath>../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/integrations/hibernate/local/pom.xml b/integrations/hibernate/local/pom.xml
index ddd811e9..71d7f5b1 100644
--- a/integrations/hibernate/local/pom.xml
+++ b/integrations/hibernate/local/pom.xml
@@ -5,7 +5,7 @@
    <artifactId>infinispan-simple-tutorials-hibernate-cache-local</artifactId>
    <parent>
       <relativePath>../../../pom.xml</relativePath>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.0.1</version>
       <groupId>org.infinispan.tutorial.simple</groupId>
       <artifactId>infinispan-simple-tutorials</artifactId>
    </parent>
diff --git a/integrations/hibernate/spring-local/pom.xml b/integrations/hibernate/spring-local/pom.xml
index 866af0b7..2a5dda4e 100644
--- a/integrations/hibernate/spring-local/pom.xml
+++ b/integrations/hibernate/spring-local/pom.xml
@@ -7,11 +7,11 @@
    <groupId>org.infinispan.tutorial.simple</groupId>
    <name>Infinispan Simple Tutorials: Hibernate Cache Spring Local</name>
    <artifactId>infinispan-simple-tutorials-hibernate-cache-spring-local</artifactId>
-   <version>16.0.0-SNAPSHOT</version>
+   <version>16.0.1</version>
 
    <parent>
       <relativePath>../../../pom.xml</relativePath>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.0.1</version>
       <groupId>org.infinispan.tutorial.simple</groupId>
       <artifactId>infinispan-simple-tutorials</artifactId>
    </parent>
diff --git a/integrations/hibernate/wildfly-local/pom.xml b/integrations/hibernate/wildfly-local/pom.xml
index d6b0c991..5da09be5 100644
--- a/integrations/hibernate/wildfly-local/pom.xml
+++ b/integrations/hibernate/wildfly-local/pom.xml
@@ -5,7 +5,7 @@
 
    <parent>
       <relativePath>../../../pom.xml</relativePath>
-      <version>16.0.0-SNAPSHOT</version>
+      <version>16.0.1</version>
       <groupId>org.infinispan.tutorial.simple</groupId>
       <artifactId>infinispan-simple-tutorials</artifactId>
    </parent>
@@ -14,7 +14,7 @@
    <name>Infinispan Simple Tutorials: Hibernate Cache Wildfly Local</name>
    <artifactId>infinispan-simple-tutorials-hibernate-cache-wildfly-local</artifactId>
    <packaging>war</packaging>
-   <version>16.0.0-SNAPSHOT</version>
+   <version>16.0.1</version>
 
    <properties>
       <java.version>1.8</java.version>
diff --git a/integrations/quarkus/infinispan-client-example/pom.xml b/integrations/quarkus/infinispan-client-example/pom.xml
index 682e4daf..b6741fb2 100644
--- a/integrations/quarkus/infinispan-client-example/pom.xml
+++ b/integrations/quarkus/infinispan-client-example/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.infinispan.tutorial.simple</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.0.1</version>
     <artifactId>quarkus-infinispan-client-example</artifactId>
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>
diff --git a/integrations/spring-boot/cache-embedded/pom.xml b/integrations/spring-boot/cache-embedded/pom.xml
index 740c9de0..4b86030e 100644
--- a/integrations/spring-boot/cache-embedded/pom.xml
+++ b/integrations/spring-boot/cache-embedded/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/integrations/spring-boot/cache-remote-reactor/pom.xml b/integrations/spring-boot/cache-remote-reactor/pom.xml
index e22f7926..95170547 100644
--- a/integrations/spring-boot/cache-remote-reactor/pom.xml
+++ b/integrations/spring-boot/cache-remote-reactor/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/integrations/spring-boot/cache-remote/pom.xml b/integrations/spring-boot/cache-remote/pom.xml
index 4fe6f29f..bac1e61f 100644
--- a/integrations/spring-boot/cache-remote/pom.xml
+++ b/integrations/spring-boot/cache-remote/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/integrations/spring-boot/session-embedded/pom.xml b/integrations/spring-boot/session-embedded/pom.xml
index e6cec8ba..2264b645 100644
--- a/integrations/spring-boot/session-embedded/pom.xml
+++ b/integrations/spring-boot/session-embedded/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/integrations/spring-boot/session-remote/pom.xml b/integrations/spring-boot/session-remote/pom.xml
index db2e8dc2..0b51335c 100644
--- a/integrations/spring-boot/session-remote/pom.xml
+++ b/integrations/spring-boot/session-remote/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/integrations/spring/spring-cache/pom.xml b/integrations/spring/spring-cache/pom.xml
index 03366199..76b6afe5 100644
--- a/integrations/spring/spring-cache/pom.xml
+++ b/integrations/spring/spring-cache/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>infinispan-simple-tutorials-spring</artifactId>
     <parent>
         <relativePath>../../../pom.xml</relativePath>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
         <groupId>org.infinispan.tutorial.simple</groupId>
         <artifactId>infinispan-simple-tutorials</artifactId>
     </parent>
diff --git a/pom.xml b/pom.xml
index ce269fff..4ff173a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
     <parent>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-build-configuration-parent</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
+        <version>16.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.infinispan.tutorial.simple</groupId>
     <artifactId>infinispan-simple-tutorials</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>16.0.1</version>
     <packaging>pom</packaging>
 
     <name>Infinispan Tutorial: Simple tutorials</name>