diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index eca91c5a1d..3e85872698 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -50,6 +50,9 @@ on:
         required: true
 jobs:
   build:
+    env:
+      DOCKER_BUILDKIT: 1
+      BUILDX_GIT_INFO: 1
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -76,7 +79,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: |
-            ${{ inputs.image }}:latest 
+            ${{ inputs.image }}:latest
             ${{ inputs.image }}:${{ inputs.version }}
           build-args: |
             CASSANDRA_STRESS_VERSION=${{ inputs.version }}
diff --git a/Dockerfile b/Dockerfile
index 76e8c6de6d..173489f37b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,6 +22,10 @@ RUN ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
 
 FROM eclipse-temurin:11-jre-noble AS production
 
+LABEL org.opencontainers.image.source="https://github.com/scylladb/cassandra-stress"
+LABEL org.opencontainers.image.title="ScyllaDB Cassandra Stress"
+
+
 ENV SCYLLA_HOME=/scylla-tools-java
 ENV SCYLLA_CONF=/scylla-tools-java/conf
 ENV PATH=$PATH:$SCYLLA_HOME/tools/bin