diff --git a/.woodpecker.yml b/.woodpecker.yml
index e61dbc4..773ad03 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -18,6 +18,9 @@ steps:
         from_secret: codeberg_password
       repo: codeberg.org/keyoxide/keyoxide-web
       tags: latest
+      build_args_from_env:
+        - CI_COMMIT_SHA
+        - CI_COMMIT_BRANCH
 
   build-tag-container:
     when:
@@ -32,6 +35,9 @@ steps:
         from_secret: codeberg_password
       repo: codeberg.org/keyoxide/keyoxide-web
       auto_tag: true
+      build_args_from_env:
+        - CI_COMMIT_SHA
+        - CI_COMMIT_BRANCH
 
   build-dev-container:
     when:
@@ -45,4 +51,7 @@ steps:
       password:
         from_secret: codeberg_password
       repo: codeberg.org/keyoxide/keyoxide-web
-      tags: dev
\ No newline at end of file
+      tags: dev
+      build_args_from_env:
+        - CI_COMMIT_SHA
+        - CI_COMMIT_BRANCH
\ No newline at end of file