diff --git a/Dockerfile b/Dockerfile
index b4ead6f..41f0dd4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,13 @@
 FROM git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23
 
-LABEL description="Alpine Baseimage with s6-overlay and lighttpd"
-LABEL build_version="Pi-Farm version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="Pi-Farm"
+ARG BUILD_DATE
+ARG BUILD_APP_VERSION
+ARG BUILD_MAINTAINER
+ARG DESCRIPTION
+
+LABEL description=${DESCRIPTION}
+LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="${BUILD_MAINTAINER}"
 
 RUN apk add --no-cache \
     lighttpd \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index b4ead6f..41f0dd4 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,8 +1,13 @@
 FROM git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23
 
-LABEL description="Alpine Baseimage with s6-overlay and lighttpd"
-LABEL build_version="Pi-Farm version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="Pi-Farm"
+ARG BUILD_DATE
+ARG BUILD_APP_VERSION
+ARG BUILD_MAINTAINER
+ARG DESCRIPTION
+
+LABEL description=${DESCRIPTION}
+LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="${BUILD_MAINTAINER}"
 
 RUN apk add --no-cache \
     lighttpd \