diff --git a/.gitmodules b/.gitmodules
index ee76b6f..e81697f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,6 +73,8 @@
 [submodule "docker-dispatcher-sdk"]
 	path = docker-dispatcher-sdk
 	url = https://github.com/aem-design/docker-dispatcher-sdk.git
+  branch = main
 [submodule "docker-mkcert"]
 	path = docker-mkcert
 	url = https://github.com/aem-design/docker-mkcert.git
+  branch = main
diff --git a/docker-aem b/docker-aem
index 0b497fd..ee2e822 160000
--- a/docker-aem
+++ b/docker-aem
@@ -1 +1 @@
-Subproject commit 0b497fd436534158ba06bc7af1a114c2de2748ed
+Subproject commit ee2e822ed8896e133b14a7b826e81b2233c99270
diff --git a/docker-java-buildpack b/docker-java-buildpack
index 2779045..728d3bf 160000
--- a/docker-java-buildpack
+++ b/docker-java-buildpack
@@ -1 +1 @@
-Subproject commit 2779045affdde4bc1ff663211828a20aef416080
+Subproject commit 728d3bf74f9b870a64d6f31a3a84efd6280174b7
diff --git a/docker-java-ffmpeg b/docker-java-ffmpeg
index ec5f0fa..deab949 160000
--- a/docker-java-ffmpeg
+++ b/docker-java-ffmpeg
@@ -1 +1 @@
-Subproject commit ec5f0fa3fe3be0b2970b2f45c9cce9ec0c9819ca
+Subproject commit deab94991efbedb1c09ab13bd5e1b289b573af47
diff --git a/docker-mkcert b/docker-mkcert
index 155d07a..4fb19e4 160000
--- a/docker-mkcert
+++ b/docker-mkcert
@@ -1 +1 @@
-Subproject commit 155d07ade212099b99922efa63b0c69d92e14777
+Subproject commit 4fb19e43c24f27624f37e40c9bc29e84ad002b12
diff --git a/docker-openjdk b/docker-openjdk
index e67b25a..b3bf24d 160000
--- a/docker-openjdk
+++ b/docker-openjdk
@@ -1 +1 @@
-Subproject commit e67b25ab614ccfef1080a142cbc32fae6974db40
+Subproject commit b3bf24d08a0a10f272adcc1d6380903d6a821907
diff --git a/docker-tini b/docker-tini
index f301196..f7b88c8 160000
--- a/docker-tini
+++ b/docker-tini
@@ -1 +1 @@
-Subproject commit f301196103204fe1bbfe163e6394b872bd96fb76
+Subproject commit f7b88c8354fe998e791ff4dbd6c13db91bb52cf6