diff --git a/helm/ingress-azure/Chart-template.yaml b/helm/ingress-azure/Chart-template.yaml
new file mode 100644
index 000000000..2dc7ad62b
--- /dev/null
+++ b/helm/ingress-azure/Chart-template.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "XXVERSIONXX"
+description: Use Azure Application Gateway as the ingress for an Azure Kubernetes Service cluster.
+name: ingress-azure
+version: XXVERSIONXX
diff --git a/helm/ingress-azure/values-template.yaml b/helm/ingress-azure/values-template.yaml
new file mode 100644
index 000000000..2e44f65b7
--- /dev/null
+++ b/helm/ingress-azure/values-template.yaml
@@ -0,0 +1,46 @@
+replicaCount: 1
+
+image:
+  repository: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress
+  tag: XXVERSIONXX
+  pullPolicy: Always
+
+################################################################################
+# Specify which kubernetes namespace the ingress controller will watch
+#
+kubernetes:
+  watchNamespace: default
+
+################################################################################
+# Specify which application gateway the ingress controller will manage
+#
+# appgw:
+#   subscriptionId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+#   resourceGroup: myResourceGroup
+#   name: myApplicationGateway
+
+################################################################################
+# Specify the authentication with Azure Resource Manager
+#
+# Two authentication methods are available:
+# - Option 1: AAD-Pod-Identity (https://github.com/Azure/aad-pod-identity)
+# armAuth:
+#   type: aadPodIdentity
+#   identityResourceID: <>
+#   identityClientID:  <>
+#
+# - Option 2: ServicePrincipal as a kubernetes secret
+# armAuth:
+#   type: servicePrincipal
+#   secretName: networking-appgw-k8s-azure-service-principal
+#   secretKey: ServicePrincipal.json
+
+################################################################################
+# Specify if the cluster is RBAC enabled or not
+# rbac:
+#     enabled: false # true/false
+
+################################################################################
+# Specify if the cluster is RBAC enabled or not
+# aksClusterConfiguration:
+#     apiServerAddress: <>
diff --git a/helm/release.sh b/helm/release.sh
old mode 100644
new mode 100755
index 13f5d8a2c..5a4ea0ae4
--- a/helm/release.sh
+++ b/helm/release.sh
@@ -1,7 +1,25 @@
 #!/bin/bash
-set -e
+
+set -eauo pipefail
+
+GIT_TAG=$(git describe --abbrev=0 --tags)
+
+TGZ_FILE=(ingress-azure-$GIT_TAG.tgz)
+
+if [ -f $TGZ_FILE ]; then
+  echo "File $TGZ_FILE already exists!"
+  exit 0
+fi
+
+echo " - update helm templates"
+cat ingress-azure/Chart-template.yaml | sed "s/XXVERSIONXX/$GIT_TAG/g" > ingress-azure/Chart.yaml
+cat ingress-azure/values-template.yaml | sed "s/XXVERSIONXX/$GIT_TAG/g" > ingress-azure/values.yaml
+
 echo " - running helm package"
-helm package ingress-azure --version 0.4.0
+helm package ingress-azure --version "$GIT_TAG"
+
 echo " - updating helm repo index"
 helm repo index . --url https://azure.github.io/application-gateway-kubernetes-ingress/helm
-echo " - done!"
\ No newline at end of file
+
+
+echo " - done!"