diff --git a/.woodpecker/build_docker.yml b/.woodpecker/build_docker.yml
index 37267fb..b690627 100644
--- a/.woodpecker/build_docker.yml
+++ b/.woodpecker/build_docker.yml
@@ -27,6 +27,7 @@ pipeline:
       dockerfile: Dockerfile.amd64
       auto_tag: true
       auto_tag_suffix: linux-amd64
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
 
   # build docker image for arm64
   dryrun-build-arm64:
@@ -42,4 +43,5 @@ pipeline:
       dockerfile: Dockerfile.arm64
       auto_tag: true
       auto_tag_suffix: linux-arm64
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
 
diff --git a/.woodpecker/publish_docker.yml b/.woodpecker/publish_docker.yml
index 49206bb..199178e 100644
--- a/.woodpecker/publish_docker.yml
+++ b/.woodpecker/publish_docker.yml
@@ -26,6 +26,7 @@ pipeline:
       dockerfile: Dockerfile.amd64
       auto_tag: true
       auto_tag_suffix: linux-amd64
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
       username:
         from_secret: cr-dhub-username
       password:
@@ -44,6 +45,7 @@ pipeline:
       dockerfile: Dockerfile.arm64
       auto_tag: true
       auto_tag_suffix: linux-arm64
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
       username:
         from_secret: cr-dhub-username
       password:
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index 09855b9..91eb028 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -13,16 +13,19 @@ RUN \
 FROM cr.44net.ch/baseimages/debian-s6:1.3.5
 
 # set version label
-ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+ARG BUILD_VERSION
+ENV FLOX_VERSION=${BUILD_VERSION}
+LABEL version="${BUILD_VERSION}"
 LABEL maintainer="Ivan Schaller"
+LABEL description="A personal watchlist"
 
-ARG db_path='/flox/backend/database/db.sqlite'
 
+# copy app from build step
 COPY --from=composer /build/flox /app/flox
 
+
 # install packages
+ARG db_path='/flox/backend/database/db.sqlite'
 RUN \
   echo "**** installing base packages ****" && \
   apt-get update && \
@@ -46,7 +49,7 @@ RUN \
       -e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
           /app/flox/backend/.env && \
   echo "**** other preparation ****" && \
-  mkdir -p mkdir -p /run/php/ && \
+  mkdir -p /run/php/ && \
   touch /run/php/php7.4-fpm.sock && \
   sed -i \
       -e 's,user =.*,user = abc,g' \
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 09855b9..91eb028 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -13,16 +13,19 @@ RUN \
 FROM cr.44net.ch/baseimages/debian-s6:1.3.5
 
 # set version label
-ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+ARG BUILD_VERSION
+ENV FLOX_VERSION=${BUILD_VERSION}
+LABEL version="${BUILD_VERSION}"
 LABEL maintainer="Ivan Schaller"
+LABEL description="A personal watchlist"
 
-ARG db_path='/flox/backend/database/db.sqlite'
 
+# copy app from build step
 COPY --from=composer /build/flox /app/flox
 
+
 # install packages
+ARG db_path='/flox/backend/database/db.sqlite'
 RUN \
   echo "**** installing base packages ****" && \
   apt-get update && \
@@ -46,7 +49,7 @@ RUN \
       -e 's,DB_DATABASE=.*,DB_DATABASE='"${db_path}"',g' \
           /app/flox/backend/.env && \
   echo "**** other preparation ****" && \
-  mkdir -p mkdir -p /run/php/ && \
+  mkdir -p /run/php/ && \
   touch /run/php/php7.4-fpm.sock && \
   sed -i \
       -e 's,user =.*,user = abc,g' \