diff --git a/buildargs.env b/buildargs.env
index dce50c7..249879e 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -1,12 +1,12 @@
 ## BUILD STAGE
-BUILD_TAG=bookworm
-BUILD_TAG_LATEST=n
+BUILD_BASE_IMAGE=debian:bookworm
 BUILD_COUNTRY=de
+BUILD_TAG=bookworm-${BUILD_COUNTRY}
+BUILD_TAG_LATEST=n
 BUILD_LANG=de_DE.UTF-8
 BUILD_LANGUAGE=de_DE:de
 BUILD_LC_ALL=de_DE.UTF-8
 BUILD_TZ=Europe/Berlin
-BUILD_BASE_IMAGE=debian:${BUILD_TAG}
 BUILD_MAINTAINER=pi-farm
 BUILD_APP_NAME=baseimage-debian-rdp-ldap
 BUILD_APP_VERSION=${BUILD_TAG}-${COUNTRY}