diff --git a/.github/workflows/bake_to_latest.yml b/.github/workflows/bake_to_latest.yml
index 361f140..c5c0cba 100644
--- a/.github/workflows/bake_to_latest.yml
+++ b/.github/workflows/bake_to_latest.yml
@@ -51,3 +51,6 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           push: true
           tags: pykmsorg/py-kms:latest,ghcr.io/py-kms-organization/py-kms:latest,pykmsorg/py-kms:minimal,ghcr.io/py-kms-organization/py-kms:minimal
+          build-args: |
+            BUILD_COMMIT=${{ github.sha }}
+            BUILD_BRANCH=${{ github.ref_name }}
diff --git a/.github/workflows/bake_to_next.yml b/.github/workflows/bake_to_next.yml
index 8f6e43c..f605731 100644
--- a/.github/workflows/bake_to_next.yml
+++ b/.github/workflows/bake_to_next.yml
@@ -40,6 +40,9 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           push: true
           tags: pykmsorg/py-kms:python3-next,ghcr.io/py-kms-organization/py-kms:python3-next
+          build-args: |
+            BUILD_COMMIT=${{ github.sha }}
+            BUILD_BRANCH=${{ github.ref_name }}
       - name: Build
         uses: docker/build-push-action@v2
         with:
@@ -48,3 +51,6 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           push: true
           tags: pykmsorg/py-kms:latest-next,ghcr.io/py-kms-organization/py-kms:latest-next,pykmsorg/py-kms:minimal-next,ghcr.io/py-kms-organization/py-kms:minimal-next
+          build-args: |
+            BUILD_COMMIT=${{ github.sha }}
+            BUILD_BRANCH=${{ github.ref_name }}
diff --git a/.github/workflows/bake_to_test.yml b/.github/workflows/bake_to_test.yml
index 4daf711..2790ba4 100644
--- a/.github/workflows/bake_to_test.yml
+++ b/.github/workflows/bake_to_test.yml
@@ -23,10 +23,16 @@ jobs:
           file: ./docker/docker-py3-kms/Dockerfile
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
           push: false
+          build-args: |
+            BUILD_COMMIT=${{ github.sha }}
+            BUILD_BRANCH=${{ github.ref_name }}
       - name: Build
         uses: docker/build-push-action@v2
         with:
           context: .
           file: ./docker/docker-py3-kms-minimal/Dockerfile
           platforms: linux/amd64,linux/386,linux/arm64/v8,linux/arm/v7,linux/arm/v6
-          push: false
\ No newline at end of file
+          push: false
+          build-args: |
+            BUILD_COMMIT=${{ github.sha }}
+            BUILD_BRANCH=${{ github.ref_name }}
\ No newline at end of file