diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d49f87e458d202295911b9f31b38f46c1541f806..8a6c0d22bc76a5a13c29d47489855e163a5c63d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -428,7 +428,7 @@ build_tango-pytango:
       - images/ska-tango-images-pytango-runtime/*
       - images/ska-tango-images-tango-pytango/*
 
-build_tango-panic:
+.build_tango-panic:
   retry: 2
   stage: build_5
   extends:
@@ -452,7 +452,7 @@ build_tango-panic:
       - images/ska-tango-images-pytango-runtime/*
       - images/ska-tango-images-tango-pytango/*
 
-build_tango-panic-gui:
+.build_tango-panic-gui:
   retry: 2
   stage: build_5
   extends:
@@ -633,7 +633,7 @@ scan_tango-pytango:
   rules:
     - !reference [.tango-pytango-rules, rules]
 
-scan_tango-panic:
+.scan_tango-panic:
   extends: 
   - .container-scanning
   variables:
@@ -641,7 +641,7 @@ scan_tango-panic:
   rules:
     - !reference [.tango-panic-rules, rules]
 
-scan_tango-panic-gui:
+.scan_tango-panic-gui:
   extends: 
   - .container-scanning
   variables:
diff --git a/.make b/.make
index 55f9c1564316e28bf8a5dad84de00906fe0b68f7..b41949598ba72e541035608dd96db83337290ff5 160000
--- a/.make
+++ b/.make
@@ -1 +1 @@
-Subproject commit 55f9c1564316e28bf8a5dad84de00906fe0b68f7
+Subproject commit b41949598ba72e541035608dd96db83337290ff5
diff --git a/.release b/.release
index b41e3b8363277677569b096e2c782f2085ea149d..8f85309fcc315c7b42966722a638c5c0f36c0e9a 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.3.22
-tag=0.3.22
+release=0.3.23
+tag=0.3.23
diff --git a/README.md b/README.md
index ad3edae30e30e74c89969472eb811f8d0039d985..92acf1f7ef8477313a145b21054f68216b686a11 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ Your branch is up-to-date with 'origin/master'.
 Already up-to-date.
 
 Step 2: Select and bump OCI Image .release's
- Tell me which of the following OCI_IMAGES_TO_PUBLISH list to bump patch release for: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies ska-tango-images-tango-db ska-tango-images-tango-cpp ska-tango-images-tango-cpp ska-tango-images-tango-java ska-tango-images-tango-java ska-tango-images-tango-rest ska-tango-images-pytango-builder ska-tango-images-pytango-builder ska-tango-images-tango-pogo ska-tango-images-tango-libtango ska-tango-images-tango-jive ska-tango-images-pytango-runtime ska-tango-images-pytango-runtime ska-tango-images-tango-admin ska-tango-images-tango-databaseds ska-tango-images-tango-test ska-tango-images-tango-dsconfig ska-tango-images-tango-itango ska-tango-images-tango-vnc ska-tango-images-tango-pytango ska-tango-images-tango-panic ska-tango-images-tango-panic-gui
+ Tell me which of the following OCI_IMAGES_TO_PUBLISH list to bump patch release for: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies ska-tango-images-tango-db ska-tango-images-tango-cpp ska-tango-images-tango-cpp ska-tango-images-tango-java ska-tango-images-tango-java ska-tango-images-tango-rest ska-tango-images-pytango-builder ska-tango-images-pytango-builder ska-tango-images-tango-pogo ska-tango-images-tango-libtango ska-tango-images-tango-jive ska-tango-images-pytango-runtime ska-tango-images-pytango-runtime ska-tango-images-tango-admin ska-tango-images-tango-databaseds ska-tango-images-tango-test ska-tango-images-tango-dsconfig ska-tango-images-tango-itango ska-tango-images-tango-vnc ska-tango-images-tango-pytango 
 Enter list here: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies
 
  You provided: ska-tango-images-tango-dependencies ska-tango-images-tango-dependencies
diff --git a/charts/ska-tango-base/Chart.yaml b/charts/ska-tango-base/Chart.yaml
index 625a51da0ecd1d7ae88af046c2f79995a3c6f3be..577b3f8dc45a8c032874bc9489d2ee28af13266e 100644
--- a/charts/ska-tango-base/Chart.yaml
+++ b/charts/ska-tango-base/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.3.22
+appVersion: 0.3.23
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-tango-base
-version: 0.3.22
+version: 0.3.23
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-util
diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml
index d2b4ea6ea18c26678434bf56b7290883493684d1..98348f40066cebd9a3cfd11d4d2b596dd818ca73 100644
--- a/charts/ska-tango-umbrella/Chart.yaml
+++ b/charts/ska-tango-umbrella/Chart.yaml
@@ -6,7 +6,7 @@ version: 0.2.5
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-base
-  version: 0.3.22
+  version: 0.3.23
   repository: file://../ska-tango-base
   condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
 - name: ska-tango-util
diff --git a/images/ska-tango-images-tango-java/.release b/images/ska-tango-images-tango-java/.release
index d893a903d5d559c64d46fdfa841c7a60be939cd2..ab56194b0accd9291353bf9870a347212f81d71b 100644
--- a/images/ska-tango-images-tango-java/.release
+++ b/images/ska-tango-images-tango-java/.release
@@ -1,2 +1,2 @@
-release=9.3.7
-tag=9.3.7
+release=9.3.8
+tag=9.3.8
diff --git a/images/ska-tango-images-tango-vnc/.release b/images/ska-tango-images-tango-vnc/.release
index 0468f411ad493a4a80c4dacf828ff9ba92f26254..c3a409dd08c6c62d48ad8f58d3c863a75bce6337 100644
--- a/images/ska-tango-images-tango-vnc/.release
+++ b/images/ska-tango-images-tango-vnc/.release
@@ -1,2 +1,2 @@
-release=0.1.6
-tag=0.1.6
+release=0.1.7
+tag=0.1.7