diff --git a/docker-jans-auth-server/Makefile b/docker-jans-auth-server/Makefile
index 48da275fa0c..430435f2f1f 100644
--- a/docker-jans-auth-server/Makefile
+++ b/docker-jans-auth-server/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/auth-server
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image --security-checks vuln ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-certmanager/Makefile b/docker-jans-certmanager/Makefile
index 0b9eab8376c..d1e9af8edef 100644
--- a/docker-jans-certmanager/Makefile
+++ b/docker-jans-certmanager/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/certmanager
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-config-api/Makefile b/docker-jans-config-api/Makefile
index 13361979cf3..c12dd38daf7 100644
--- a/docker-jans-config-api/Makefile
+++ b/docker-jans-config-api/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/config-api
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image --security-checks vuln ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-configurator/Makefile b/docker-jans-configurator/Makefile
index 8d618cf2f16..3c33031d789 100644
--- a/docker-jans-configurator/Makefile
+++ b/docker-jans-configurator/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/configurator
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-fido2/Makefile b/docker-jans-fido2/Makefile
index 3dd5111d244..e15e0e1d0f1 100644
--- a/docker-jans-fido2/Makefile
+++ b/docker-jans-fido2/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/fido2
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image --security-checks vuln ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-monolith/Makefile b/docker-jans-monolith/Makefile
index c9a31b3bb35..6b2207bfaca 100644
--- a/docker-jans-monolith/Makefile
+++ b/docker-jans-monolith/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/monolith
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image --security-checks vuln ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-persistence-loader/Makefile b/docker-jans-persistence-loader/Makefile
index 248bd63bbd0..6a7d8b3957e 100644
--- a/docker-jans-persistence-loader/Makefile
+++ b/docker-jans-persistence-loader/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/persistence-loader
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}
diff --git a/docker-jans-scim/Makefile b/docker-jans-scim/Makefile
index 82293ba8821..7d610f4fb0f 100644
--- a/docker-jans-scim/Makefile
+++ b/docker-jans-scim/Makefile
@@ -1,18 +1,18 @@
 CN_VERSION?=1.0.5-SNAPSHOT
 IMAGE_NAME=janssenproject/scim
-UNSTABLE_VERSION?=dev
+DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"
-	@docker build --rm --force-rm -t ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} .
+	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
+	@docker build --rm --force-rm -t ${IMAGE_NAME}:${DEV_VERSION} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using trivy"
-	@trivy image --security-checks vuln ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
+	@trivy image --security-checks vuln ${IMAGE_NAME}:${DEV_VERSION}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION} using grype"
-	@grype -v ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}
+	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
+	@grype -v ${IMAGE_NAME}:${DEV_VERSION}