diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml
index 6ec53f14..c6e33ce0 100644
--- a/helmfile/environments/default/charts.yaml
+++ b/helmfile/environments/default/charts.yaml
@@ -254,7 +254,7 @@ charts:
     registry: "artifacts.software-univention.de"
     repository: "nubus-dev/charts"
     name: "nubus"
-    version: "0.39.0-pre-jtorres-keycloak-upgrade"
+    version: "0.38.0-pre-jtorres-keycloak-upgrade"
     verify: true
   opendeskKeycloakBootstrap:
     # providerCategory: "Platform"
diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml
index c36a4e51..e4289f16 100644
--- a/helmfile/environments/default/images.yaml
+++ b/helmfile/environments/default/images.yaml
@@ -367,7 +367,7 @@ images:
     # repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-notifier"
     registry: "artifacts.software-univention.de"
     repository: "nubus/images/ldap-notifier"
-    tag: "0.22.1@sha256:34a7afc7789705f964846b340c0368d144cff397c718fda8902944cf22e61c15"
+    tag: "0.15.2@sha256:1f2a9d2136c8e87a4c4a59a94a2235d00e969c98bd7bfe75707a299918f271b5"
   nubusLdapServer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -501,8 +501,10 @@ images:
     # upstreamRepository: "nubus/images/provisioning-dispatcher"
     # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
     # upstreamMirrorStartFrom: ["0", "14", "0"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
+    # registry: "registry.opencode.de"
+    # repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
+    registry: "artifacts.software-univention.de"
+    repository: "nubus/images/provisioning-dispatcher"
     tag: "0.28.3@sha256:79c81b0143e78c7cabb1efd63d47530eac686fba11db57c173abd8ebdd396778"
   nubusProvisioningEventsAndConsumerApi:
     # providerCategory: "Supplier"
@@ -515,7 +517,7 @@ images:
     # repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
     registry: "artifacts.software-univention.de"
     repository: "nubus/images/provisioning-events-and-consumer-api"
-    tag: "0.36.0@sha256:69dd2946e7b05384304eeeca50dea645d20f7658d225e7c532381c3bdf2027ce"
+    tag: "0.28.3@sha256:5b0a2c52d715fde613ecfedb3a3f5e47b9eb73cdcf4c373a9cc58248a919f2bf"
   nubusProvisioningPrefill:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -527,7 +529,7 @@ images:
     # repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
     registry: "artifacts.software-univention.de"
     repository: "nubus/images/provisioning-prefill"
-    tag: "0.36.0@sha256:147406648848c068aacc2cb467633d51c65cddbcaa622c352e5fe5349bf92ce6"
+    tag: "0.28.3@sha256:a98bce46144a6ff943b0432b66277393b7b476b8969b221b9069c708d3380f5d"
   nubusProvisioningUdmListener:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -539,7 +541,7 @@ images:
     # repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
     registry: "artifacts.software-univention.de"
     repository: "nubus/images/provisioning-udm-listener"
-    tag: "0.36.0@sha256:8a960db9ff94b3c8a63be1588e47ccc1f62f3071abdce7ee2ef89afbe2674eed"
+    tag: "0.28.3@sha256:b9c452e55e6716f93309bef0af7d401e218cd1e6ea9ad3d2819fb10dd631aecd"
   nubusProvisioningUdmTransformer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -551,7 +553,7 @@ images:
     # repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
     registry: "artifacts.software-univention.de"
     repository: "nubus/images/provisioning-udm-transformer"
-    tag: "0.36.0@sha256:8080b55e705391aa2ac9b11db11dc1f984b5626271b2f175bfe26967b857b06d"
+    tag: "0.28.3@sha256:00dd93474df695cfdfa4daba5aae4442a4180abfbb8171dcc9f17d1edee176dd"
   nubusSelfserviceInvitation:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -619,8 +621,10 @@ images:
     # upstreamRepository: "nubus/images/wait-for-dependency"
     # upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
     # upstreamMirrorStartFrom: ["0", "9", "4"]
-    registry: "registry.opencode.de"
-    repository: "bmi/opendesk/components/supplier/univention/images-mirror/wait-for-dependency"
+    # registry: "registry.opencode.de"
+    # repository: "bmi/opendesk/components/supplier/univention/images-mirror/wait-for-dependency"
+    registry: "artifacts.software-univention.de"
+    repository: "nubus/images/wait-for-dependency"
     tag: "0.25.0@sha256:71a4d66fd67db6f92212b1936862b2b0d5a678d412213d74452a9195c2fe67f7"
   opendeskKeycloakBootstrap:
     # providerCategory: "Platform"