diff --git a/package.json b/package.json
index b9fd34d76d..e2741d67e5 100644
--- a/package.json
+++ b/package.json
@@ -43,9 +43,10 @@
     "lint": "eslint '*/*/src/**/*.{js,ts}' --quiet --fix && cspell \"*/*/src/**/*.{js,ts}\"",
     "tsc": "tsc --build --verbose",
     "codegen": "lerna run codegen",
-    "precodegen": "yarn codegen:warmup-v5.2.1 & yarn codegen:warmup-v6.3.0",
-    "codegen:warmup-v5.2.1": "yarn openapi-generator-cli version-manager set 5.2.1 && rm openapitools.json",
-    "codegen:warmup-v6.3.0": "yarn openapi-generator-cli version-manager set 6.3.0 && rm openapitools.json",
+    "precodegen": "npm-run-all --parallel --aggregate-output --continue-on-error --print-label --print-name codegen:warmup-*",
+    "postcodegen": "rm --force --verbose ./openapitools.json",
+    "codegen:warmup-v5.2.1": "yarn openapi-generator-cli version-manager set 5.2.1",
+    "codegen:warmup-v6.3.0": "yarn openapi-generator-cli version-manager set 6.3.0",
     "watch-other": "lerna run --parallel watch",
     "watch-tsc": "tsc --build --watch",
     "watch": "run-p -r watch-*",
diff --git a/tools/docker/fabric-all-in-one/Dockerfile_v1.4.x b/tools/docker/fabric-all-in-one/Dockerfile_v1.4.x
index 3b8a1f382f..4c1ed74f38 100644
--- a/tools/docker/fabric-all-in-one/Dockerfile_v1.4.x
+++ b/tools/docker/fabric-all-in-one/Dockerfile_v1.4.x
@@ -1,6 +1,6 @@
 # We need to use the older, more stable v18 here because of
 # https://github.com/docker-library/docker/issues/170
-FROM docker:20.10.17
+FROM docker:24.0.2-dind
 
 ARG FABRIC_VERSION=1.4.8
 ARG CA_VERSION=1.4.9
diff --git a/tools/docker/fabric-all-in-one/Dockerfile_v2.x b/tools/docker/fabric-all-in-one/Dockerfile_v2.x
index a5920f92c9..eb47ecb26b 100644
--- a/tools/docker/fabric-all-in-one/Dockerfile_v2.x
+++ b/tools/docker/fabric-all-in-one/Dockerfile_v2.x
@@ -1,6 +1,6 @@
 # We need to use the older, more stable v18 here because of
 # https://github.com/docker-library/docker/issues/170
-FROM docker:20.10.3-dind
+FROM docker:24.0.2-dind
 
 ARG FABRIC_VERSION=2.2.0
 ARG CA_VERSION=1.4.9