diff --git a/README.md b/README.md
index 7d1d68ba6..b3c8bcdde 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ Follow the [developer's guide](docs/develop/index.md) to know more about the pro
 
 ## Status
 
-`v1.8.0` released against GeoServer `2.25.0`.
+`v1.8.1` released against GeoServer `2.25.0`.
 
 Read the [changelog](https://github.com/geoserver/geoserver-cloud/releases/) for more information.
 
diff --git a/compose/.env b/compose/.env
index 0495083bb..13436cdc4 100644
--- a/compose/.env
+++ b/compose/.env
@@ -1,6 +1,6 @@
 # docker-compose default environment variable values
 COMPOSE_PROJECT_NAME=gscloud_dev
-TAG=1.8-SNAPSHOT
+TAG=1.8.1
 ACL_TAG=2.2.0
 GS_USER="1000:1000"
 
diff --git a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml
index b781aa706..523093155 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.8.0
+    image: geoservercloud/geoserver-cloud-discovery:1.8.1
     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.8.0
+    image: geoservercloud/geoserver-cloud-config:1.8.1
     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.8.0 tag
-      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.8.0
+      # get the config for this release from the v1.8.1 tag
+      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.8.1
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /tmp/git_config
       # 'native' profile config
@@ -97,7 +97,7 @@ services:
   # Application facade, provides a single entry point routing to all
   # microservices (e.g. http://localhost:9090/geoserver/cloud/wms, http://localhost:9090/geoserver/cloud/wfs, etc)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:1.8.0
+    image: geoservercloud/geoserver-cloud-gateway:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -116,7 +116,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.8.0
+    image: geoservercloud/geoserver-cloud-wfs:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -132,7 +132,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.8.0
+    image: geoservercloud/geoserver-cloud-wms:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -148,7 +148,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.8.0
+    image: geoservercloud/geoserver-cloud-wcs:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -164,7 +164,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.8.0
+    image: geoservercloud/geoserver-cloud-rest:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -182,7 +182,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.8.0
+    image: geoservercloud/geoserver-cloud-webui:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - rabbitmq
@@ -197,7 +197,7 @@ services:
           cpus: '2.0'
           memory: 1G
   gwc:
-    image: geoservercloud/geoserver-cloud-gwc:1.8.0
+    image: geoservercloud/geoserver-cloud-gwc:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
diff --git a/docs/deploy/docker-compose/stable/pgconfig/compose.yml b/docs/deploy/docker-compose/stable/pgconfig/compose.yml
index 33bac4952..3767fa09e 100644
--- a/docs/deploy/docker-compose/stable/pgconfig/compose.yml
+++ b/docs/deploy/docker-compose/stable/pgconfig/compose.yml
@@ -81,7 +81,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.8.0
+    image: geoservercloud/geoserver-cloud-discovery:1.8.1
     user: 1000:1000
     depends_on:
       - config
@@ -97,7 +97,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.8.0
+    image: geoservercloud/geoserver-cloud-config:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     environment:
       # Either 'git' or 'native'. Use the default sample git repository to download the services configuration from
@@ -106,7 +106,7 @@ 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.8.0 tag
+      # get the config for this release from the v1.8.1 tag
       SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: master
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /tmp/git_config
@@ -126,7 +126,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.8.0
+    image: geoservercloud/geoserver-cloud-gateway:1.8.1
     user: 1000:1000
     depends_on:
       - discovery
@@ -143,7 +143,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.8.0
+    image: geoservercloud/geoserver-cloud-wfs:1.8.1
     extends:
       service: geoserver
     depends_on:
@@ -162,7 +162,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.8.0
+    image: geoservercloud/geoserver-cloud-wms:1.8.1
     extends:
       service: geoserver
     depends_on:
@@ -181,7 +181,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.8.0
+    image: geoservercloud/geoserver-cloud-wcs:1.8.1
     extends:
       service: geoserver
     depends_on:
@@ -200,7 +200,7 @@ services:
 
   # WPS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wps=5)
   wps:
-    image: geoservercloud/geoserver-cloud-wps:1.8.0
+    image: geoservercloud/geoserver-cloud-wps:1.8.1
     extends:
       service: geoserver
     depends_on:
@@ -219,7 +219,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.8.0
+    image: geoservercloud/geoserver-cloud-rest:1.8.1
     extends:
       service: geoserver
     depends_on:
@@ -238,7 +238,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.8.0
+    image: geoservercloud/geoserver-cloud-webui:1.8.1
     extends:
       service: geoserver
     volumes:
@@ -258,7 +258,7 @@ services:
       replicas: 1
 
   gwc:
-    image: geoservercloud/geoserver-cloud-gwc:1.8.0
+    image: geoservercloud/geoserver-cloud-gwc:1.8.1
     extends:
       service: geoserver
     volumes:
@@ -278,7 +278,7 @@ services:
       replicas: 1
 
   geoserver:
-    image: geoservercloud/geoserver-cloud-webui:1.8.0
+    image: geoservercloud/geoserver-cloud-webui:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     environment:
       JAVA_OPTS: -XX:MaxRAMPercentage=80 -XshowSettings:system 
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 f5446f086..50cdb157c 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.8.0
+    image: geoservercloud/geoserver-cloud-discovery:1.8.1
     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.8.0
+    image: geoservercloud/geoserver-cloud-config:1.8.1
     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.8.0 tag
-      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.8.0
+      # get the config for this release from the v1.8.1 tag
+      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.8.1
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /tmp/git_config
       # 'native' profile config
@@ -87,7 +87,7 @@ services:
   # Application facade, provides a single entry point routing to all
   # microservices (e.g. http://localhost:9090/geoserver/cloud/wms, http://localhost:9090/geoserver/cloud/wfs, etc)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:1.8.0
+    image: geoservercloud/geoserver-cloud-gateway:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -106,7 +106,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.8.0
+    image: geoservercloud/geoserver-cloud-wfs:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -125,7 +125,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.8.0
+    image: geoservercloud/geoserver-cloud-wms:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -144,7 +144,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.8.0
+    image: geoservercloud/geoserver-cloud-wcs:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -163,7 +163,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.8.0
+    image: geoservercloud/geoserver-cloud-rest:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -184,7 +184,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.8.0
+    image: geoservercloud/geoserver-cloud-webui:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
@@ -203,7 +203,7 @@ services:
           cpus: '2.0'
           memory: 1G
   gwc:
-    image: geoservercloud/geoserver-cloud-gwc:1.8.0
+    image: geoservercloud/geoserver-cloud-gwc:1.8.1
     user: 1000:1000 # set the userid:groupid the container runs as
     depends_on:
       - config
diff --git a/docs/deploy/podman/traditional/manual/podman.md b/docs/deploy/podman/traditional/manual/podman.md
index 8fa799922..093e31e8a 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.8.0
+export GSCLOUD_VERSION=1.8.1
 
 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.8.0 \
+  -e SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL=v1.8.1 \
   -e CONFIG_GIT_BASEDIR=/opt/app/git_config \
   geoservercloud/geoserver-cloud-config:$GSCLOUD_VERSION
 ```
diff --git a/docs/develop/index.md b/docs/develop/index.md
index 3255c5e26..bb91f8082 100644
--- a/docs/develop/index.md
+++ b/docs/develop/index.md
@@ -152,15 +152,15 @@ The simple build command above creates the following docker images:
 
 ```bash
 $ docker images|grep geoserver-cloud|sort
-geoservercloud/geoserver-cloud-config                1.8.0        be987ff2a85e        42 minutes ago      319MB
-geoservercloud/geoserver-cloud-discovery             1.8.0        abc5a17cf14c        42 minutes ago      320MB
-geoservercloud/geoserver-cloud-gateway               1.8.0        10f267950c15        42 minutes ago      317MB
-geoservercloud/geoserver-cloud-rest                  1.8.0        29406a1e1fdb        36 minutes ago      429MB
-geoservercloud/geoserver-cloud-wcs                   1.8.0        c77ac22aa522        37 minutes ago      391MB
-geoservercloud/geoserver-cloud-webui                 1.8.0        876d6fc3fac0        36 minutes ago      449MB
-geoservercloud/geoserver-cloud-wfs                   1.8.0        62960137eb5a        38 minutes ago      410MB
-geoservercloud/geoserver-cloud-wms                   1.8.0        6686ca90b552        38 minutes ago      437MB
-geoservercloud/geoserver-cloud-wps                   1.8.0        73bae600226c        37 minutes ago      416MB
+geoservercloud/geoserver-cloud-config                1.8.1        be987ff2a85e        42 minutes ago      319MB
+geoservercloud/geoserver-cloud-discovery             1.8.1        abc5a17cf14c        42 minutes ago      320MB
+geoservercloud/geoserver-cloud-gateway               1.8.1        10f267950c15        42 minutes ago      317MB
+geoservercloud/geoserver-cloud-rest                  1.8.1        29406a1e1fdb        36 minutes ago      429MB
+geoservercloud/geoserver-cloud-wcs                   1.8.1        c77ac22aa522        37 minutes ago      391MB
+geoservercloud/geoserver-cloud-webui                 1.8.1        876d6fc3fac0        36 minutes ago      449MB
+geoservercloud/geoserver-cloud-wfs                   1.8.1        62960137eb5a        38 minutes ago      410MB
+geoservercloud/geoserver-cloud-wms                   1.8.1        6686ca90b552        38 minutes ago      437MB
+geoservercloud/geoserver-cloud-wps                   1.8.1        73bae600226c        37 minutes ago      416MB
 ```
 
 To run the build without building the docker images, disable the `docker` maven profile:
diff --git a/docs/index.md b/docs/index.md
index be28ded2c..7c4cdbf4e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -176,7 +176,7 @@ The following diagram depicts the System's general architecture:
  
 # Project Status
 
-Version `1.8.0` has been released against a slightly customized GeoServer `2.25.0`
+Version `1.8.1` has been released against a slightly customized GeoServer `2.25.0`
 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.
diff --git a/pom.xml b/pom.xml
index a4a9631e7..086a10bf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <module>src</module>
   </modules>
   <properties>
-    <revision>1.8-SNAPSHOT</revision>
+    <revision>1.8.1</revision>
     <fmt.action>format</fmt.action>
     <fmt.skip>false</fmt.skip>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>