diff --git a/.github/workflows/upload_release.yaml b/.github/workflows/upload_release.yaml
index 4ec4e75..84eed36 100644
--- a/.github/workflows/upload_release.yaml
+++ b/.github/workflows/upload_release.yaml
@@ -77,5 +77,5 @@ jobs:
 
       - name: 'Build Image'
         run: |
-          docker buildx build --output type=docker --tag ghcr.io/${{ env.REPO_LC }}/app:${{ github.event.release.tag_name }} --tag ghcr.io/${{ env.REPO_LC }}/app:latest  .
-          docker push ghcr.io/${{ env.REPO_LC }}/app --all-tags
+          docker buildx build --output type=docker --tag ghcr.io/${{ env.REPO_LC }}:${{ github.event.release.tag_name }} --tag ghcr.io/${{ env.REPO_LC }}:latest  .
+          docker push ghcr.io/${{ env.REPO_LC }} --all-tags
diff --git a/k8s_01/templates/daemonset.yaml b/k8s_01/templates/daemonset.yaml
index d277040..c691f39 100644
--- a/k8s_01/templates/daemonset.yaml
+++ b/k8s_01/templates/daemonset.yaml
@@ -38,7 +38,7 @@ spec:
           name: host-var-lib-docker-containers
       containers:
         - name: kubelogreader
-          image: "{{.Values.image.repository}}/{{.Values.image.path}}:{{.Values.image.tag}}"
+          image: "{{.Values.image.repository}}/{{.Values.image.path}}:{{.Chart.Version}}"
           imagePullPolicy: {{.Values.image.pullPolicy}}
           securityContext:
             privileged: true
diff --git a/k8s_01/values.yaml b/k8s_01/values.yaml
index 1f9438a..675e3bf 100644
--- a/k8s_01/values.yaml
+++ b/k8s_01/values.yaml
@@ -1,8 +1,7 @@
 image:
-  # Image will be downloaded from {repository}/{path}:{tag}
+  # Image will be downloaded from {repository}/{path}:{Tag from Chart.Version}
   repository: ghcr.io
-  path: teragrep/k8s_01/app
-  tag: latest
+  path: teragrep/k8s_01
   pullPolicy: IfNotPresent
 
 config: