diff --git a/.woodpecker/build_docker.yml b/.woodpecker/build_docker.yml
index b39268c..91ef280 100644
--- a/.woodpecker/build_docker.yml
+++ b/.woodpecker/build_docker.yml
@@ -30,7 +30,7 @@ pipeline:
       dockerfile: docker/Dockerfile.amd64
       auto_tag: true
       auto_tag_suffix: linux-amd64
-      build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)"
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
 
   # build docker image for arm64
   dryrun-build-arm64:
@@ -46,5 +46,5 @@ pipeline:
       dockerfile: docker/Dockerfile.arm64
       auto_tag: true
       auto_tag_suffix: linux-arm64#
-      build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)"
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
 
diff --git a/.woodpecker/publish_docker.yml b/.woodpecker/publish_docker.yml
index 9e71224..f0aa5f7 100644
--- a/.woodpecker/publish_docker.yml
+++ b/.woodpecker/publish_docker.yml
@@ -29,7 +29,7 @@ pipeline:
       dockerfile: docker/Dockerfile.amd64
       auto_tag: true
       auto_tag_suffix: linux-amd64
-      build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)"
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
       username:
         from_secret: cr-dhub-username
       password:
@@ -48,7 +48,7 @@ pipeline:
       dockerfile: docker/Dockerfile.arm64
       auto_tag: true
       auto_tag_suffix: linux-arm64
-      build_args: BUILD_DATE="$(date +%Y-%m-%d_%H:%M)"
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
       username:
         from_secret: cr-dhub-username
       password:
diff --git a/docker/Dockerfile.amd64 b/docker/Dockerfile.amd64
index 2cf4d3f..97e922d 100644
--- a/docker/Dockerfile.amd64
+++ b/docker/Dockerfile.amd64
@@ -1,10 +1,11 @@
 FROM cr.44net.ch/baseimages/debian-s6:1.3.5
 
 # set version label
-ENV MDLP_VERSION=2.1.5
-ARG BUILD_DATE
-LABEL build_version="Version: ${MDLP_VERSION} - Build-date: ${BUILD_DATE}"
+ARG BUILD_VERSION
+ENV MDLP_VERSION=${BUILD_VERSION}
+LABEL version="${BUILD_VERSION}"
 LABEL maintainer="Ivan Schaller"
+LABEL description="A CLI manga downloader"
 
 
 # install packages
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index 9f92aeb..621b995 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -1,10 +1,11 @@
 FROM cr.44net.ch/baseimages/debian-s6:1.3.5
 
 # set version label
-ENV MDLP_VERSION=2.1.5
-ARG BUILD_DATE
-LABEL build_version="Version: ${MDLP_VERSION} - Build-date: ${BUILD_DATE}"
+ARG BUILD_VERSION
+ENV MDLP_VERSION=${BUILD_VERSION}
+LABEL version="${BUILD_VERSION}"
 LABEL maintainer="Ivan Schaller"
+LABEL description="A CLI manga downloader"
 
 
 # install packages