diff --git a/docker-compose.yaml b/docker-compose.yaml
index d16fd7b871..904c859b9b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
       - '3306:3306'
     labels:
       lagoon.type: mariadb
-      lagoon.image: amazeeiolagoon/api-db:v0-22-1
+      lagoon.image: amazeeiolagoon/api-db:v0-23-0
   cli:
     image: ${IMAGE_REPO:-lagoon}/cli
     volumes:
@@ -37,7 +37,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/webhook-handler/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/webhook-handler:v0-22-1
+      lagoon.image: amazeeiolagoon/webhook-handler:v0-23-0
   broker:
     image: ${IMAGE_REPO:-lagoon}/broker-single
     ports:
@@ -46,7 +46,7 @@ services:
     labels:
       lagoon.type: rabbitmq-cluster
       lagoon.template: services/broker/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/broker:v0-22-1
+      lagoon.image: amazeeiolagoon/broker:v0-23-0
   openshiftremove:
     image: ${IMAGE_REPO:-lagoon}/openshiftremove
     command: yarn run dev
@@ -56,7 +56,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftremove/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/openshiftremove:v0-22-1
+      lagoon.image: amazeeiolagoon/openshiftremove:v0-23-0
   openshiftbuilddeploy:
     image: ${IMAGE_REPO:-lagoon}/openshiftbuilddeploy
     command: yarn run dev
@@ -68,7 +68,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftbuilddeploy/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/openshiftbuilddeploy:v0-22-1
+      lagoon.image: amazeeiolagoon/openshiftbuilddeploy:v0-23-0
   openshiftbuilddeploymonitor:
     image: ${IMAGE_REPO:-lagoon}/openshiftbuilddeploymonitor
     command: yarn run dev
@@ -82,7 +82,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftbuilddeploymonitor/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/openshiftbuilddeploymonitor:v0-22-1
+      lagoon.image: amazeeiolagoon/openshiftbuilddeploymonitor:v0-23-0
   openshiftjobs:
     image: ${IMAGE_REPO:-lagoon}/openshiftjobs
     command: yarn run dev
@@ -92,7 +92,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftjobs/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/openshiftjobs:v0-22-1
+      lagoon.image: amazeeiolagoon/openshiftjobs:v0-23-0
   openshiftjobsmonitor:
     image: ${IMAGE_REPO:-lagoon}/openshiftjobsmonitor
     command: yarn run dev
@@ -102,7 +102,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftjobsmonitor/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/openshiftjobsmonitor:v0-22-1
+      lagoon.image: amazeeiolagoon/openshiftjobsmonitor:v0-23-0
   openshiftmisc:
     image: ${IMAGE_REPO:-lagoon}/openshiftmisc
     command: yarn run dev
@@ -112,7 +112,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/openshiftmisc/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/openshiftmisc:v0-22-1
+      lagoon.image: amazeeiolagoon/openshiftmisc:v0-23-0
   logs2rocketchat:
     image: ${IMAGE_REPO:-lagoon}/logs2rocketchat
     command: yarn run dev
@@ -122,7 +122,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/logs2rocketchat/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/logs2rocketchat:v0-22-1
+      lagoon.image: amazeeiolagoon/logs2rocketchat:v0-23-0
   logs2slack:
     image: ${IMAGE_REPO:-lagoon}/logs2slack
     command: yarn run dev
@@ -132,7 +132,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/logs2slack/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/logs2slack:v0-22-1
+      lagoon.image: amazeeiolagoon/logs2slack:v0-23-0
   webhooks2tasks:
     image: ${IMAGE_REPO:-lagoon}/webhooks2tasks
     command: yarn run dev
@@ -142,7 +142,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/webhooks2tasks/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/webhooks2tasks:v0-22-1
+      lagoon.image: amazeeiolagoon/webhooks2tasks:v0-23-0
   rest2tasks:
     image: ${IMAGE_REPO:-lagoon}/rest2tasks
     command: yarn run dev
@@ -154,7 +154,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/rest2tasks/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/rest2tasks:v0-22-1
+      lagoon.image: amazeeiolagoon/rest2tasks:v0-23-0
   api:
     image: ${IMAGE_REPO:-lagoon}/api
     command: yarn run dev
@@ -170,7 +170,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/api/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/api:v0-22-1
+      lagoon.image: amazeeiolagoon/api:v0-23-0
   ui:
     image: ${IMAGE_REPO:-lagoon}/ui
     command: yarn run dev
@@ -184,7 +184,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/ui/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/ui:v0-22-1
+      lagoon.image: amazeeiolagoon/ui:v0-23-0
   ssh:
     image: ${IMAGE_REPO:-lagoon}/ssh
     depends_on:
@@ -207,7 +207,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/ssh/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/ssh:v0-22-1
+      lagoon.image: amazeeiolagoon/ssh:v0-23-0
   auth-server:
     image: ${IMAGE_REPO:-lagoon}/auth-server
     command: yarn run dev
@@ -222,7 +222,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/auth-server/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/auth-server:v0-22-1
+      lagoon.image: amazeeiolagoon/auth-server:v0-23-0
   keycloak:
     image: ${IMAGE_REPO:-lagoon}/keycloak
     user: '111111111'
@@ -233,14 +233,14 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/keycloak/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/keycloak:v0-22-1
+      lagoon.image: amazeeiolagoon/keycloak:v0-23-0
   keycloak-db:
     image: ${IMAGE_REPO:-lagoon}/keycloak-db
     ports:
       - '3336:3306'
     labels:
       lagoon.type: mariadb
-      lagoon.image: amazeeiolagoon/keycloak-db:v0-22-1
+      lagoon.image: amazeeiolagoon/keycloak-db:v0-23-0
   tests:
     image: ${IMAGE_REPO:-lagoon}/tests
     environment:
@@ -310,7 +310,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/drush-alias/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/drush-alias:v0-22-1
+      lagoon.image: amazeeiolagoon/drush-alias:v0-23-0
       version: '2'
   logs-db:
     image: ${IMAGE_REPO:-lagoon}/logs-db
@@ -322,14 +322,14 @@ services:
     labels:
       lagoon.type: elasticsearch
       lagoon.template: services/logs-db/.lagoon.single.yml
-      lagoon.image: amazeeiolagoon/logs-db:v0-22-1
+      lagoon.image: amazeeiolagoon/logs-db:v0-23-0
   logs-forwarder:
     image: ${IMAGE_REPO:-lagoon}/logs-forwarder
     user: '111111111'
     labels:
       lagoon.type: custom
       lagoon.template: services/logs-forwarder/.lagoon.single.yml
-      lagoon.image: amazeeiolagoon/logs-forwarder:v0-22-1
+      lagoon.image: amazeeiolagoon/logs-forwarder:v0-23-0
   logs-db-ui:
     image: ${IMAGE_REPO:-lagoon}/logs-db-ui
     user: '111111111'
@@ -341,14 +341,14 @@ services:
     labels:
       lagoon.type: kibana
       lagoon.template: services/logs-db-ui/.lagoon.yml
-      lagoon.image: amazeeiolagoon/logs-db-ui:v0-22-1
+      lagoon.image: amazeeiolagoon/logs-db-ui:v0-23-0
   logs-db-curator:
     image: ${IMAGE_REPO:-lagoon}/logs-db-curator
     user: '111111111'
     labels:
       lagoon.type: cli
       lagoon.template: services/logs-db-curator/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/logs-db-curator:v0-22-1
+      lagoon.image: amazeeiolagoon/logs-db-curator:v0-23-0
   logs2logs-db:
     image: ${IMAGE_REPO:-lagoon}/logs2logs-db
     user: '111111111'
@@ -364,7 +364,7 @@ services:
     labels:
       lagoon.type: logstash
       lagoon.template: services/logs2logs-db/.lagoon.yml
-      lagoon.image: amazeeiolagoon/logs2logs-db:v0-22-1
+      lagoon.image: amazeeiolagoon/logs2logs-db:v0-23-0
   auto-idler:
     image: ${IMAGE_REPO:-lagoon}/auto-idler
     user: '111111111'
@@ -375,7 +375,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/auto-idler/.lagoon.yml
-      lagoon.image: amazeeiolagoon/auto-idler:v0-22-1
+      lagoon.image: amazeeiolagoon/auto-idler:v0-23-0
   storage-calculator:
     image: ${IMAGE_REPO:-lagoon}/storage-calculator
     user: '111111111'
@@ -384,7 +384,7 @@ services:
     labels:
       lagoon.type: custom
       lagoon.template: services/storage-calculator/.lagoon.yml
-      lagoon.image: amazeeiolagoon/storage-calculator:v0-22-1
+      lagoon.image: amazeeiolagoon/storage-calculator:v0-23-0
   logs-collector:
     image: openshift/origin-logging-fluentd:v3.6.1
     labels: