diff --git a/README.md b/README.md
index 3206d1d9a..7851e46ea 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ Follow the [developer's guide](docs/develop/index.md) to know more about the pro
 
 ## Status
 
-`v1.0-RC29` released against GeoServer `2.22.1`.
+`v1.0-RC30` released against GeoServer `2.22.2`.
 
 Read the [changelog](https://github.com/geoserver/geoserver-cloud/releases/tag/v1.0-RC14) for more information.
 
diff --git a/docker-compose-shared_datadir.yml b/docker-compose-shared_datadir.yml
index a94c08d10..72867b6d8 100644
--- a/docker-compose-shared_datadir.yml
+++ b/docker-compose-shared_datadir.yml
@@ -15,9 +15,6 @@ volumes:
       device: $PWD/docker-compose_datadir
   
 services:
-  database:
-    entrypoint: echo "database-service disabled."
-
   #catalog:
   #  command: echo "catalog-service disabled."
 
diff --git a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml
index 9f8efb703..d2a15363f 100644
--- a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml
+++ b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml
@@ -45,7 +45,7 @@ services:
   # Browse to http://localhost:8761 to check all services are registered.
   # Run docker-compose -f docker-compose.yml -f docker-compose-discovery-ha.yml to run extra discovery service instances for HA
   discovery:
-    image: geoservercloud/geoserver-cloud-discovery:1.0-RC29
+    image: geoservercloud/geoserver-cloud-discovery:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     ports:
       - 8761:8761
@@ -62,7 +62,7 @@ services:
   # microservices. Being a Discovery First Bootstrap configuration, it'll
   # register itself with the Eureka discovery service and can be scaled
   config:
-    image: geoservercloud/geoserver-cloud-config:1.0-RC29
+    image: geoservercloud/geoserver-cloud-config:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - discovery
@@ -75,8 +75,8 @@ services:
       SPRING_PROFILES_ACTIVE: git
       # 'git' profile config
       CONFIG_GIT_URI: https://github.com/geoserver/geoserver-cloud-config.git
-      # get the config for this release from the v1.0-RC29 tag
-      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC29
+      # get the config for this release from the v1.0-RC30 tag
+      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC30
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /tmp/git_config
       # 'native' profile config
@@ -95,7 +95,7 @@ services:
           memory: 512M
 
   admin:
-    image: geoservercloud/geoserver-cloud-admin-server:1.0-RC29
+    image: geoservercloud/geoserver-cloud-admin-server:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -112,7 +112,7 @@ services:
   # Application facade, provides a single entry point routing to all
   # microservices (e.g. http://localhost:9090/geoserver/wms, http://localhost:9090/geoserver/wfs, etc)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:1.0-RC29
+    image: geoservercloud/geoserver-cloud-gateway:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -130,7 +130,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.0-RC29
+    image: geoservercloud/geoserver-cloud-wfs:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -146,7 +146,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.0-RC29
+    image: geoservercloud/geoserver-cloud-wms:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -162,7 +162,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.0-RC29
+    image: geoservercloud/geoserver-cloud-wcs:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -178,7 +178,7 @@ services:
 
   # REST config microservice, port dynamically allocated to allow scaling (e.g docker-compose scale rest=5)
   rest:
-    image: geoservercloud/geoserver-cloud-rest:1.0-RC29
+    image: geoservercloud/geoserver-cloud-rest:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -196,7 +196,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.0-RC29
+    image: geoservercloud/geoserver-cloud-webui:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - rabbitmq
@@ -211,7 +211,7 @@ services:
           cpus: '2.0'
           memory: 1G
   gwc:
-    image: geoservercloud/geoserver-cloud-gwc:1.0-RC29
+    image: geoservercloud/geoserver-cloud-gwc:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
diff --git a/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml b/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml
index 882eda6e7..87394ea54 100644
--- a/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml
+++ b/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml
@@ -36,7 +36,7 @@ services:
   # Browse to http://localhost:8761 to check all services are registered.
   # Run docker-compose -f docker-compose.yml -f docker-compose-discovery-ha.yml to run extra discovery service instances for HA
   discovery:
-    image: geoservercloud/geoserver-cloud-discovery:1.0-RC29
+    image: geoservercloud/geoserver-cloud-discovery:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     ports:
       - 8761:8761
@@ -53,7 +53,7 @@ services:
   # microservices. Being a Discovery First Bootstrap configuration, it'll
   # register itself with the Eureka discovery service and can be scaled
   config:
-    image: geoservercloud/geoserver-cloud-config:1.0-RC29
+    image: geoservercloud/geoserver-cloud-config:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - discovery
@@ -65,8 +65,8 @@ services:
       SPRING_PROFILES_ACTIVE: git
       # 'git' profile config
       CONFIG_GIT_URI: https://github.com/geoserver/geoserver-cloud-config.git
-      # get the config for this release from the v1.0-RC29 tag
-      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC29
+      # get the config for this release from the v1.0-RC30 tag
+      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC30
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /tmp/git_config
       # 'native' profile config
@@ -85,7 +85,7 @@ services:
           memory: 512M
 
   admin:
-    image: geoservercloud/geoserver-cloud-admin-server:1.0-RC29
+    image: geoservercloud/geoserver-cloud-admin-server:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -102,7 +102,7 @@ services:
   # Application facade, provides a single entry point routing to all
   # microservices (e.g. http://localhost:9090/geoserver/wms, http://localhost:9090/geoserver/wfs, etc)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:1.0-RC29
+    image: geoservercloud/geoserver-cloud-gateway:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -120,7 +120,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.0-RC29
+    image: geoservercloud/geoserver-cloud-wfs:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -139,7 +139,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.0-RC29
+    image: geoservercloud/geoserver-cloud-wms:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -158,7 +158,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.0-RC29
+    image: geoservercloud/geoserver-cloud-wcs:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -177,7 +177,7 @@ services:
 
   # REST config microservice, port dynamically allocated to allow scaling (e.g docker-compose scale rest=5)
   rest:
-    image: geoservercloud/geoserver-cloud-rest:1.0-RC29
+    image: geoservercloud/geoserver-cloud-rest:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -198,7 +198,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.0-RC29
+    image: geoservercloud/geoserver-cloud-webui:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -217,7 +217,7 @@ services:
           cpus: '2.0'
           memory: 1G
   gwc:
-    image: geoservercloud/geoserver-cloud-gwc:1.0-RC29
+    image: geoservercloud/geoserver-cloud-gwc:1.0-RC30
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
diff --git a/docs/deploy/podman/traditional/manual/env b/docs/deploy/podman/traditional/manual/env
index 5b25f11e1..1d79617a6 100644
--- a/docs/deploy/podman/traditional/manual/env
+++ b/docs/deploy/podman/traditional/manual/env
@@ -1,2 +1,2 @@
-GSCLOUD_VERSION=1.0-RC29
+GSCLOUD_VERSION=1.0-RC30
 
diff --git a/docs/deploy/podman/traditional/manual/podman.md b/docs/deploy/podman/traditional/manual/podman.md
index eded004c7..8f3ebfcec 100644
--- a/docs/deploy/podman/traditional/manual/podman.md
+++ b/docs/deploy/podman/traditional/manual/podman.md
@@ -28,7 +28,7 @@ In order to speed up the "starting" part of the documentation we are going to do
 
 ```bash
 podman pull docker.io/library/rabbitmq:3.9-management 
-export GSCLOUD_VERSION=1.0-RC29
+export GSCLOUD_VERSION=1.0-RC30
 
 for service in discovery config gateway admin-server rest webui wms wfs wcs
 do
@@ -71,7 +71,7 @@ podman run -d --name=config --hostname=config \
   --network gs-cloud-network \
   -e SPRING_PROFILES_ACTIVE=git \
   -e CONFIG_GIT_URI=https://github.com/geoserver/geoserver-cloud-config.git \
-  -e SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL=v1.0-RC29 \
+  -e SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL=v1.0-RC30 \
   -e CONFIG_GIT_BASEDIR=/opt/app/git_config \
   geoservercloud/geoserver-cloud-config:$GSCLOUD_VERSION
 ```
diff --git a/docs/index.md b/docs/index.md
index 71b6a239f..56333ee34 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -178,7 +178,7 @@ The following diagram depicts the System's general architecture:
  
 # Project Status
 
-Version `1.0-RC29` has been released against a slightly customized GeoServer `2.22.1`
+Version `1.0-RC30` has been released against a slightly customized GeoServer `2.22.2`
 with some important fixes to allow starting up several GeoServer instances from an empty
 directory or database. We will make sure to contribute those fixes upstream before the final
 release.