diff --git a/Jenkinsfile b/Jenkinsfile
index d593346..89b6e0c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         maintainer_credential_ref = 'dockerhub-tier'
         imagename = 'g'
         tag = 'l'
-        version='4.0.1'
+        version='4.0.2'
     }
     stages {
         stage('Setting build context') {
diff --git a/comanage-registry-base/README.md b/comanage-registry-base/README.md
index 898a5eb..146bf58 100644
--- a/comanage-registry-base/README.md
+++ b/comanage-registry-base/README.md
@@ -53,7 +53,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION}"
 docker build \
diff --git a/comanage-registry-basic-auth-develop/README.md b/comanage-registry-basic-auth-develop/README.md
index 31bfbbd..0d7de01 100644
--- a/comanage-registry-basic-auth-develop/README.md
+++ b/comanage-registry-basic-auth-develop/README.md
@@ -59,7 +59,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_BASIC_AUTH_DEVELOP_IMAGE_VERSION=1
 TAG="${COMANAGE_REGISTRY_VERSION}-basic-auth-develop-${COMANAGE_REGISTRY_BASIC_AUTH_DEVELOP_IMAGE_VERSION}" 
@@ -111,7 +111,7 @@ docker run -d \
   -v /opt/comanage-registry-local:/srv/comanage-registry/local \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.0.1-basic-auth-develop-1
+  comanage-registry:4.0.2-basic-auth-develop-1
 ```
 
 ## Logging
diff --git a/comanage-registry-basic-auth/README.md b/comanage-registry-basic-auth/README.md
index 1453651..7d9a97e 100644
--- a/comanage-registry-basic-auth/README.md
+++ b/comanage-registry-basic-auth/README.md
@@ -58,7 +58,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_BASIC_AUTH_IMAGE_VERSION=1
 TAG="${COMANAGE_REGISTRY_VERSION}-basic-auth-${COMANAGE_REGISTRY_BASIC_AUTH_IMAGE_VERSION}" 
@@ -110,7 +110,7 @@ docker run -d \
   -v /opt/comanage-registry-local:/srv/comanage-registry/local \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.0.1-basic-auth-1
+  comanage-registry:4.0.2-basic-auth-1
 ```
 
 ## Logging
diff --git a/comanage-registry-cron/README.md b/comanage-registry-cron/README.md
index d6ec255..e604826 100644
--- a/comanage-registry-cron/README.md
+++ b/comanage-registry-cron/README.md
@@ -52,7 +52,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_CRON_IMAGE_VERSION=1
 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_CRON_IMAGE_VERSION}"
@@ -172,7 +172,7 @@ To run this image:
 docker run -d \
   --name comanage-registry-cron \
   -v /opt/comanage-registry-local:/srv/comanage-registry/local \
-  comanage-registry-cron:4.0.1-1
+  comanage-registry-cron:4.0.2-1
 ```
 
 ## Logging
diff --git a/comanage-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile
index 54c2f82..80c0877 100644
--- a/comanage-registry-internet2-tier/Dockerfile
+++ b/comanage-registry-internet2-tier/Dockerfile
@@ -144,7 +144,7 @@ EXPOSE 80 443
 # following line (to prevent other scripts from processing it).
 #####     ENV TIER_BEACON_OPT_OUT True
 
-ENV TIER_RELEASE=211207
+ENV TIER_RELEASE=220223
 ENV TIER_MAINTAINER=tier
 
 WORKDIR /srv/comanage-registry
diff --git a/comanage-registry-internet2-tier/README.md b/comanage-registry-internet2-tier/README.md
index 2bcb752..32674b8 100644
--- a/comanage-registry-internet2-tier/README.md
+++ b/comanage-registry-internet2-tier/README.md
@@ -58,7 +58,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_I2_IMAGE_VERSION=1
@@ -134,7 +134,7 @@ docker run -d \
   -v /etc/shibboleth/my-org-metadata.xml:/etc/shibboleth/my-org-metadata.xml \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.0.1-internet2-tier-1
+  comanage-registry:4.0.2-internet2-tier-1
 ```
 
 ## Logging
diff --git a/comanage-registry-mod-auth-openidc/README.md b/comanage-registry-mod-auth-openidc/README.md
index 8db7761..e37aa97 100644
--- a/comanage-registry-mod-auth-openidc/README.md
+++ b/comanage-registry-mod-auth-openidc/README.md
@@ -57,7 +57,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_MOD_AUTH_OPENIDC_IMAGE_VERSION=1
 TAG="${COMANAGE_REGISTRY_VERSION}-mod-auth-openidc-${COMANAGE_REGISTRY_MOD_AUTH_OPENIDC_IMAGE_VERSION}"
@@ -129,7 +129,7 @@ docker run -d \
   -v mod-auth-openidc.conf:/etc/apache2/conf-enabled/mod-auth-openidc.conf \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.0.1-mod-auth-openidc-1
+  comanage-registry:4.0.2-mod-auth-openidc-1
 ```
 
 ## Logging
diff --git a/comanage-registry-shibboleth-sp/README.md b/comanage-registry-shibboleth-sp/README.md
index fea82f5..0d61046 100644
--- a/comanage-registry-shibboleth-sp/README.md
+++ b/comanage-registry-shibboleth-sp/README.md
@@ -55,7 +55,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_SHIBBOLETH_SP_VERSION=3.3.0
 export COMANAGE_REGISTRY_SHIBBOLETH_SP_BASE_IMAGE_VERSION=1
@@ -115,7 +115,7 @@ docker run -d \
   -v /etc/shibboleth/my-org-metadata.xml:/etc/shibboleth/my-org-metadata.xml \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.0.1-shibboleth-sp-1
+  comanage-registry:4.0.2-shibboleth-sp-1
 ```
 
 ## Logging
diff --git a/common.bash b/common.bash
index eb68b6e..4a7058f 100644
--- a/common.bash
+++ b/common.bash
@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="comanage-registry"
-COMANAGE_REGISTRY_VERSION="4.0.1"
+COMANAGE_REGISTRY_VERSION="4.0.2"
diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md
index 7b9b18a..c76cadd 100644
--- a/docs/comanage-registry-internet2-tier.md
+++ b/docs/comanage-registry-internet2-tier.md
@@ -50,7 +50,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 ```
 
 * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
diff --git a/docs/evaluation.md b/docs/evaluation.md
index 0d0789f..8b6628e 100644
--- a/docs/evaluation.md
+++ b/docs/evaluation.md
@@ -44,7 +44,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 ```
 
 * Build the base COmanage Registry image:
diff --git a/docs/mod-auth-openidc-mariadb.md b/docs/mod-auth-openidc-mariadb.md
index 2ca86c8..329aeb3 100644
--- a/docs/mod-auth-openidc-mariadb.md
+++ b/docs/mod-auth-openidc-mariadb.md
@@ -42,7 +42,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 ```
 
 * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
diff --git a/docs/shibboleth-sp-mariadb.md b/docs/shibboleth-sp-mariadb.md
index c4aca0d..6de9643 100644
--- a/docs/shibboleth-sp-mariadb.md
+++ b/docs/shibboleth-sp-mariadb.md
@@ -42,7 +42,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 ```
 
 * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
diff --git a/docs/shibboleth-sp-postgresql.md b/docs/shibboleth-sp-postgresql.md
index f28cade..f503fca 100644
--- a/docs/shibboleth-sp-postgresql.md
+++ b/docs/shibboleth-sp-postgresql.md
@@ -42,7 +42,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 ```
 
 * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
diff --git a/docs/simple-development-plugin-mariadb.md b/docs/simple-development-plugin-mariadb.md
index e5ffb3e..aaba93b 100644
--- a/docs/simple-development-plugin-mariadb.md
+++ b/docs/simple-development-plugin-mariadb.md
@@ -48,7 +48,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.1
+export COMANAGE_REGISTRY_VERSION=4.0.2
 ```
 
 ## Build necessary images
diff --git a/docs/volumes-and-data-persistence.md b/docs/volumes-and-data-persistence.md
index 8de588a..ceb2c5a 100644
--- a/docs/volumes-and-data-persistence.md
+++ b/docs/volumes-and-data-persistence.md
@@ -50,7 +50,7 @@ docker run -d \
   -v /opt/comanage-registry-local:/srv/comanage-registry/local \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.0.1-shibboleth-sp-1
+  comanage-registry:4.0.2-shibboleth-sp-1
 ```
 
 After the image is instantiated into a container for the first time