diff --git a/Makefile b/Makefile
index a6cc5dc..070b299 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,20 @@ all: help
 
 ## Build and push docker image
 release:
-	docker buildx build --platform=linux/amd64 --platform=linux/arm64 -t dariomader/twampy:latest --push $(ROOT)
+	docker buildx build --platform=linux/amd64 --platform=linux/arm64 -t dariomader/twampy:$(tag) --push $(ROOT)
+
+
+## Pack, index Helm chart
+helm:
+	make package index
+
+## Index helm chart
+index:
+	helm repo index --merge install/kubernetes/index.yaml install/kubernetes --url https://github.com/darox/python3-twampy/raw/main/install/kubernetes/
+
+## Package helm chart
+package:
+	helm package ./install/kubernetes/twampy --destination ./install/kubernetes/releases
 
 ## Start Docker compose stack
 local-up:
diff --git a/install/kubernetes/index.yaml b/install/kubernetes/index.yaml
index 3151c70..2935671 100644
--- a/install/kubernetes/index.yaml
+++ b/install/kubernetes/index.yaml
@@ -1,9 +1,22 @@
 apiVersion: v1
 entries:
   twampy:
+  - apiVersion: v2
+    appVersion: 0.0.2
+    created: "2023-11-30T08:14:15.022438+01:00"
+    description: A Helm chart for Kubernetes to deploy twampy. Twampy is a TWAMP client
+      and server implementation written in Python. Orginally developed by Nokia and
+      customized by https://github.com/darox/python3-twampy.
+    digest: 8e729082d60a023e34113740474f6a5bd3e44273cc593eebc6baf3c2e86e0380
+    icon: https://raw.githubusercontent.com/darox/python3-twampy/main/assets/icon.png
+    name: twampy
+    type: application
+    urls:
+    - https://github.com/darox/python3-twampy/raw/main/install/kubernetes/releases/twampy-0.0.2.tgz
+    version: 0.0.2
   - apiVersion: v2
     appVersion: 0.0.1
-    created: "2023-11-29T12:39:25.794531+01:00"
+    created: "2023-11-30T08:14:15.021946+01:00"
     description: A Helm chart for Kubernetes to deploy twampy. Twampy is a TWAMP client
       and server implementation written in Python. Orginally developed by Nokia and
       customized by https://github.com/darox/python3-twampy.
@@ -14,4 +27,4 @@ entries:
     urls:
     - https://github.com/darox/python3-twampy/raw/main/install/kubernetes/releases/twampy-0.0.1.tgz
     version: 0.0.1
-generated: "2023-11-29T12:39:25.79329+01:00"
+generated: "2023-11-30T08:14:15.020709+01:00"
diff --git a/install/kubernetes/releases/twampy-0.0.2.tgz b/install/kubernetes/releases/twampy-0.0.2.tgz
new file mode 100644
index 0000000..b5a8f7d
Binary files /dev/null and b/install/kubernetes/releases/twampy-0.0.2.tgz differ
diff --git a/install/kubernetes/twampy/Chart.yaml b/install/kubernetes/twampy/Chart.yaml
index 29d912b..39e037c 100644
--- a/install/kubernetes/twampy/Chart.yaml
+++ b/install/kubernetes/twampy/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: twampy
 description: A Helm chart for Kubernetes to deploy twampy. Twampy is a TWAMP client and server implementation written in Python. Orginally developed by Nokia and customized by https://github.com/darox/python3-twampy.
 type: application
-version: 0.0.1
-appVersion: "0.0.1"
+version: 0.0.2
+appVersion: "0.0.2"
 icon: https://raw.githubusercontent.com/darox/python3-twampy/main/assets/icon.png
 
 
diff --git a/install/kubernetes/twampy/values.yaml b/install/kubernetes/twampy/values.yaml
index bffaad5..2cb7ecd 100644
--- a/install/kubernetes/twampy/values.yaml
+++ b/install/kubernetes/twampy/values.yaml
@@ -29,7 +29,7 @@ sender:
     repository: dariomader/twampy
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "v0.0.2"
 
   imagePullSecrets: []
   nameOverride: ""
@@ -124,7 +124,7 @@ responder:
     repository: dariomader/twampy
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "v0.0.2"
 
   imagePullSecrets: []
   nameOverride: ""