diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0165d0e38..997a647b1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,5 @@
 #################################################################################
-#  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -21,7 +21,8 @@
 ---
 version: 2
 updates:
-  # Maven
+
+  # Gradle
   -
     package-ecosystem: "gradle"
     target-branch: main
@@ -44,6 +45,14 @@ updates:
       interval: "weekly"
 
   # Docker
+  - package-ecosystem: "docker"
+    target-branch: main
+    directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/
+    labels:
+      - "dependabot"
+      - "docker"
+    schedule:
+      interval: "weekly"
   -
     package-ecosystem: "docker"
     target-branch: main
@@ -56,7 +65,7 @@ updates:
   -
     package-ecosystem: "docker"
     target-branch: main
-    directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/
+    directory: ./edc-controlplane/edc-runtime-memory/src/main/docker/
     labels:
       - "dependabot"
       - "docker"
@@ -65,7 +74,7 @@ updates:
   -
     package-ecosystem: "docker"
     target-branch: main
-    directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/
+    directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
     labels:
       - "dependabot"
       - "docker"
@@ -74,7 +83,7 @@ updates:
   -
     package-ecosystem: "docker"
     target-branch: main
-    directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
+    directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
       - "docker"
@@ -83,7 +92,16 @@ updates:
   -
     package-ecosystem: "docker"
     target-branch: main
-    directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
+    directory: ./edc-tests/runtime/mock-connector/src/main/docker/
+    labels:
+      - "dependabot"
+      - "docker"
+    schedule:
+      interval: "weekly"
+  -
+    package-ecosystem: "docker"
+    target-branch: main
+    directory: ./samples/edc-dast/edc-dast-runtime/src/main/docker/
     labels:
       - "dependabot"
       - "docker"
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 63a0c26c9..c3feab034 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -8,11 +8,11 @@ maven/mavencentral/com.apicatalog/titanium-json-ld/1.4.0, Apache-2.0, approved,
 maven/mavencentral/com.azure/azure-core-http-netty/1.13.11, MIT AND Apache-2.0, approved, #7948
 maven/mavencentral/com.azure/azure-core-http-netty/1.14.0, MIT AND Apache-2.0, approved, #13238
 maven/mavencentral/com.azure/azure-core-http-netty/1.14.2, MIT AND Apache-2.0, approved, #13238
-maven/mavencentral/com.azure/azure-core-http-netty/1.15.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-core-http-netty/1.15.0, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-core/1.45.1, MIT AND Apache-2.0, approved, #11845
 maven/mavencentral/com.azure/azure-core/1.46.0, MIT AND Apache-2.0, approved, #13234
 maven/mavencentral/com.azure/azure-core/1.48.0, MIT AND Apache-2.0, approved, #14409
-maven/mavencentral/com.azure/azure-core/1.49.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-core/1.49.0, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-identity/1.11.2, MIT AND Apache-2.0, approved, #13237
 maven/mavencentral/com.azure/azure-identity/1.12.1, MIT AND Apache-2.0, approved, #14412
 maven/mavencentral/com.azure/azure-json/1.1.0, MIT AND Apache-2.0, approved, #10547
diff --git a/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
index 281f7baaf..04a3c182f 100644
--- a/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
+++ b/edc-controlplane/edc-runtime-memory/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@
 #################################################################################
 
 
-FROM eclipse-temurin:21.0.2_13-jre-alpine
+FROM eclipse-temurin:22.0.1_8-jre-alpine
 ARG JAR
 
 ARG APP_USER=docker
diff --git a/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile b/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile
index 999103615..a7cc2e36c 100644
--- a/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile
+++ b/edc-tests/runtime/mock-connector/src/main/docker/Dockerfile
@@ -18,7 +18,7 @@
 #################################################################################
 
 
-FROM eclipse-temurin:22_36-jre-alpine
+FROM eclipse-temurin:22.0.1_8-jre-alpine
 ARG JAR
 ARG OTEL_JAR
 ARG ADDITIONAL_FILES
diff --git a/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile b/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile
index def311707..0a233f5e7 100644
--- a/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile
+++ b/samples/edc-dast/edc-dast-runtime/src/main/docker/Dockerfile
@@ -17,7 +17,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 #################################################################################
 
-FROM eclipse-temurin:22_36-jre-alpine
+FROM eclipse-temurin:22.0.1_8-jre-alpine
 ARG JAR
 ARG OTEL_JAR
 ARG ADDITIONAL_FILES