diff --git a/drone/ContainerImageDocker.yml b/drone/ContainerImageDocker.yml
index d1fc4df..1558c0f 100644
--- a/drone/ContainerImageDocker.yml
+++ b/drone/ContainerImageDocker.yml
@@ -40,6 +40,7 @@
     MERGE_REGISTRY_JSON: "true"
     DEBUG_STEP: "false"
     PUSH_TAGS: "true"
+    DOCKER_BUILDKIT: 1
 
   commands:
     - &ContainerImageDockerCommands |
diff --git a/drone/HelmChart.yml b/drone/HelmChart.yml
index bfdd829..b9bc868 100644
--- a/drone/HelmChart.yml
+++ b/drone/HelmChart.yml
@@ -22,6 +22,7 @@
 
     CHART_PATH: "./chart"
 
+    TAG_CHART_VERSION_ENABLE: "false"
     TAG_COMMIT_ENABLE: "true"
     TAG_COMMIT_BASE_VERSION: "0.0.0"
     TAG_COMMIT_PREFIX: "commit-"
@@ -61,7 +62,15 @@
       if [[ "$GITLAB_HELM_REPO_AUTH" == "true" ]]; then
         helm repo add --username="${CI_REGISTRY_USER}" --password="${CI_REGISTRY_PASSWORD}" "$HELM_REPO_NAME" $HELM_STABLE_ENDPOINT
       fi
-    
+
+    # tag based on chart version, install jq first
+    - |
+      if [[ "$TAG_CHART_VERSION_ENABLE" == "true" ]]; then
+        apk add jq
+        CHART_VERSION=$(cat Chart.yaml | yq .version)
+        helm cm-push . "$HELM_REPO_NAME" --version=$CHART_VERSION
+      fi
+
     # default tag based on commit
     - |
       if [[ "$TAG_COMMIT_ENABLE" == "true" ]]; then