diff --git a/buildargs.env b/buildargs.env
index bf1a8da..eb0cdb9 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -4,19 +4,16 @@ BUILD_COUNTRY=de
 
 ## BUILD STAGE
 BUILD_BASE_IMAGE="debian:${DEBIAN_CODENAME}"
-BUILD_TAG="${DEBIAN_CODENAME}-${BUILD_COUNTRY}"
+BUILD_TAG="${DEBIAN_CODENAME}-gnome-${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_MAINTAINER=pi-farm
-BUILD_APP_NAME=base-image-debian-rdp-ldap
+BUILD_APP_NAME=debian-${DEBIAN_CODENAME}-gnome-rdp-ldap
 BUILD_APP_VERSION=1.0.0
-PUSH=dockerhub
-
-## BASE PACKAGES
-BUILD_BASE_PACKAGES="xrdp sssd sssd-tools libpam-sss libnss-sss libsss-sudo ldap-utils ca-certificates dbus-x11 xfce4 xfce4-terminal sudo firefox-esr firefox-esr-l10n-${BUILD_COUNTRY} thunderbird thunderbird-l10n-${BUILD_COUNTRY} locales tzdata keyboard-configuration x11-xkb-utils pulseaudio build-essential dpkg-dev git libpulse-dev meson ninja-build pkg-config autoconf libtool thunar-archive-plugin xarchiver unzip zip p7zip-full tar gzip bzip2 dialog whiptail"
+PUSH=gitea
 
 ## ENV STAGE
 ENV_SSSD_DEBUG_LEVEL=5