diff --git a/buildargs.env b/buildargs.env
index 71449ad..299abbb 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -1,7 +1,10 @@
-## BUILD STAGE
-BUILD_BASE_IMAGE=debian:trixie
+## BASE CONFIG
+DEBIAN_CODENAME=trixie
 BUILD_COUNTRY=de
-BUILD_TAG=trixie-de-dev
+
+## BUILD STAGE
+BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
+BUILD_TAG="${DEBIAN_CODENAME}-${BUILD_COUNTRY}"
 BUILD_TAG_LATEST=n
 BUILD_LANG=de_DE.UTF-8
 BUILD_LANGUAGE=de_DE:de
@@ -9,7 +12,7 @@ BUILD_LC_ALL=de_DE.UTF-8
 BUILD_TZ=Europe/Berlin
 BUILD_MAINTAINER=pi-farm
 BUILD_APP_NAME=base-image-debian-rdp-ldap
-BUILD_APP_VERSION=1.0.0-dev
+BUILD_APP_VERSION=1.0.0
 PUSH=dockerhub
 
 ## ENV STAGE
@@ -22,6 +25,6 @@ ENV_LDAP_SUDO_GROUP=YOUR-SUDO-USERS-GROUP
 
 ## DOCKER / COMPOSE CONFIG
 VOL_HOME=./YOUR-PERSISTENT-FOLDER:/home
-PORT_RDP=3389
+PORT_RDP=3389:3389
 
 DESCRIPTION="Debian Desktop with LDAP Authentication and PulseAudio. To use behind Guacamole with LDAP Authentication and pass-through to Debian Desktop."
\ No newline at end of file