diff --git a/build-bin/helm/helm_prepare b/build-bin/helm/helm_prepare
index ec3351e..3f021cd 100755
--- a/build-bin/helm/helm_prepare
+++ b/build-bin/helm/helm_prepare
@@ -33,13 +33,13 @@ fi
 
 # Update appVersion
 latest_app_version=${2?latest_app_version is required. Ex 4.5.6}
-sh -c "sed -i 's/appVersion\:\s[0-9.]\+/appVersion\: ${latest_app_version}/g' Chart.yaml"
+sh -c "sed -i 's/appVersion\:\s[0-9.]\+/appVersion\: ${latest_app_version}/g' ./charts/zipkin/Chart.yaml"
 
 # Update version
-sh -c "sed -i 's/version\:\s[0-9.]\+/version\: ${release_version}/g' Chart.yaml"
+sh -c "sed -i 's/version\:\s[0-9.]\+/version\: ${release_version}/g' ./charts/zipkin/Chart.yaml"
 
-# Commit changes to Chart.yaml
-git add Chart.yaml && git commit -m "chore: prepare chart release ${release_version}"
+# Commit changes to ./charts/zipkin/Chart.yaml
+git add ./charts/zipkin/Chart.yaml && git commit -m "chore: prepare chart release ${release_version}"
 
-# Push the changes in Chart.yaml to the release branch
+# Push the changes in ./charts/zipkin/Chart.yaml to the release branch
 git push origin ${release_branch}
diff --git a/Chart.yaml b/charts/zipkin/Chart.yaml
similarity index 98%
rename from Chart.yaml
rename to charts/zipkin/Chart.yaml
index 0ba39db..45bcbf8 100644
--- a/Chart.yaml
+++ b/charts/zipkin/Chart.yaml
@@ -14,7 +14,7 @@ appVersion: 2.26.0
 name: zipkin
 description: A Zipkin helm chart for kubernetes
 type: application
-version: 0.1.0
+version: 0.0.0
 maintainers:
   - name: openzipkin
     email: zipkin-dev@googlegroups.com
diff --git a/templates/NOTES.txt b/charts/zipkin/templates/NOTES.txt
similarity index 100%
rename from templates/NOTES.txt
rename to charts/zipkin/templates/NOTES.txt
diff --git a/templates/_helpers.tpl b/charts/zipkin/templates/_helpers.tpl
similarity index 100%
rename from templates/_helpers.tpl
rename to charts/zipkin/templates/_helpers.tpl
diff --git a/templates/deployment.yaml b/charts/zipkin/templates/deployment.yaml
similarity index 100%
rename from templates/deployment.yaml
rename to charts/zipkin/templates/deployment.yaml
diff --git a/templates/hpa.yaml b/charts/zipkin/templates/hpa.yaml
similarity index 100%
rename from templates/hpa.yaml
rename to charts/zipkin/templates/hpa.yaml
diff --git a/templates/ingress.yaml b/charts/zipkin/templates/ingress.yaml
similarity index 100%
rename from templates/ingress.yaml
rename to charts/zipkin/templates/ingress.yaml
diff --git a/templates/psp.yaml b/charts/zipkin/templates/psp.yaml
similarity index 100%
rename from templates/psp.yaml
rename to charts/zipkin/templates/psp.yaml
diff --git a/templates/role.yaml b/charts/zipkin/templates/role.yaml
similarity index 100%
rename from templates/role.yaml
rename to charts/zipkin/templates/role.yaml
diff --git a/templates/rolebinding.yaml b/charts/zipkin/templates/rolebinding.yaml
similarity index 100%
rename from templates/rolebinding.yaml
rename to charts/zipkin/templates/rolebinding.yaml
diff --git a/templates/service.yaml b/charts/zipkin/templates/service.yaml
similarity index 100%
rename from templates/service.yaml
rename to charts/zipkin/templates/service.yaml
diff --git a/templates/serviceaccount.yaml b/charts/zipkin/templates/serviceaccount.yaml
similarity index 100%
rename from templates/serviceaccount.yaml
rename to charts/zipkin/templates/serviceaccount.yaml
diff --git a/values.schema.json b/charts/zipkin/values.schema.json
similarity index 100%
rename from values.schema.json
rename to charts/zipkin/values.schema.json
diff --git a/values.yaml b/charts/zipkin/values.yaml
similarity index 100%
rename from values.yaml
rename to charts/zipkin/values.yaml