diff --git a/charts/applicationset/Chart.yaml b/charts/applicationset/Chart.yaml
index 321477b..a31af92 100644
--- a/charts/applicationset/Chart.yaml
+++ b/charts/applicationset/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-applicationsets-services
 description: A HELM Chart for ArgoCD ApplicationSets for Kubernetes
 type: application
-version: &version "0.6.0"
+version: &version "0.6.1"
 appVersion: *version
 kubeVersion: ">= 1.23"
 home: https://github.com/saidsef/argocd-applicationsets-services
@@ -22,7 +22,8 @@ sources:
 annotations:
   artifacthub.io/license: "Apache-2.0"
   artifacthub.io/changes: |
-    - "Add GitLab group name option to variables"
+    - "Refactored helm and kustomize rendering"
+    - "Update documentation"
   artifacthub.io/links: |
     - name: README
       url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/README.md
diff --git a/charts/applicationset/README.md b/charts/applicationset/README.md
index d8e6bbe..8930977 100644
--- a/charts/applicationset/README.md
+++ b/charts/applicationset/README.md
@@ -1,6 +1,6 @@
 # argocd-applicationsets-services
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square)
+![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.1](https://img.shields.io/badge/AppVersion-0.6.1-informational?style=flat-square)
 
 A HELM Chart for ArgoCD ApplicationSets for Kubernetes
 
@@ -30,7 +30,7 @@ Kubernetes: `>= 1.23`
 | name | string | `"pr-review"` | ApplicationSet name |
 | namespace | string | `"argocd"` | Namespace of ArgoCD controller is deployed |
 | notificationChannel | string | `"argocd"` | ArgoCD Slack notification channel |
-| repos | object | `{"github":[{"images":["docker.io/saidsef/node-webserver:{{branch}}"],"name":"node-webserver"},{"name":"alpine-jenkins-dockerfile","path":"deployment/preview"},{"images":["docker.io/saidsef/aws-kinesis-local:{{branch}}"],"name":"aws-kinesis-local"},{"images":["docker.io/saidsef/aws-dynamodb-local:{{branch}}"],"name":"aws-dynamodb-local"},{"name":"tika-document-to-text","path":"deployment/preview"},{"name":"scapy-containerised","path":"charts/scapy","values":{"image":{"tag":"{{branch}}"}}},{"name":"faas-reverse-geocoding","parameters":[{"name":"image.tag","value":"{{branch}}"},{"name":"ingress.enabled","value":"true"},{"name":"ingress.hosts[0].host","value":"{{branch}}"}],"path":"charts/reverse-geocoding","repoUrl":"https://saidsef.github.io/faas-reverse-geocoding"}],"gitlab":{}}` | List of repo names and override images for preview environment to dynamically pass the branch of the pull request head use '{{branch}}' variable see: https://argocd-applicationset.readthedocs.io/en/stable/Generators-Pull-Request/#template |
+| repos | object | `{"github":[{"images":["docker.io/saidsef/node-webserver:{{branch_slug}}"],"name":"node-webserver"},{"name":"alpine-jenkins-dockerfile","path":"deployment/preview"},{"images":["docker.io/saidsef/aws-kinesis-local:{{branch_slug}}"],"name":"aws-kinesis-local"},{"images":["docker.io/saidsef/aws-dynamodb-local:{{branch_slug}}"],"name":"aws-dynamodb-local"},{"name":"tika-document-to-text","path":"deployment/preview"},{"name":"scapy-containerised","path":"charts/scapy","values":{"image":{"tag":"{{branch_slug}}"}}},{"chart":"reverse-geocoding","name":"faas-reverse-geocoding","parameters":[{"name":"image.tag","value":"{{branch_slug}}"},{"name":"ingress.enabled","value":"true"},{"name":"ingress.enabled","value":"true"},{"name":"ingress.hosts[0].host","value":"{{branch_slug}}"}],"repoUrl":"https://saidsef.github.io/faas-reverse-geocoding"}],"gitlab":{}}` | List of repo names and override images for preview environment to dynamically pass the branch of the pull request head use '{{branch_slug}}' variable see: https://argocd-applicationset.readthedocs.io/en/stable/Generators-Pull-Request/#template |
 | requeueAfterSeconds | int | `500` | GitHub polling rate (seconds) |
 | retryBackoffDuration | string | `"10s"` | Duration is the amount to back off retries of failed syncs |
 | server | string | `"https://kubernetes.default.svc"` | ArgoCD server address |
diff --git a/charts/applicationset/values.yaml b/charts/applicationset/values.yaml
index 4a34d1c..8e2f4d0 100644
--- a/charts/applicationset/values.yaml
+++ b/charts/applicationset/values.yaml
@@ -26,7 +26,7 @@ gitlab:
 label: 'preview'
 
 # -- List of repo names and override images for preview environment
-# to dynamically pass the branch of the pull request head use '{{branch}}' variable
+# to dynamically pass the branch of the pull request head use '{{branch_slug}}' variable
 # see: https://argocd-applicationset.readthedocs.io/en/stable/Generators-Pull-Request/#template
 repos:
   gitlab: {}
@@ -37,32 +37,34 @@ repos:
   github:
   - name: node-webserver
     images:
-    - 'docker.io/saidsef/node-webserver:{{branch}}'
+    - 'docker.io/saidsef/node-webserver:{{branch_slug}}'
   - name: alpine-jenkins-dockerfile
     path: 'deployment/preview'
   - name: aws-kinesis-local
     images:
-    - 'docker.io/saidsef/aws-kinesis-local:{{branch}}'
+    - 'docker.io/saidsef/aws-kinesis-local:{{branch_slug}}'
   - name: aws-dynamodb-local
     images:
-    - 'docker.io/saidsef/aws-dynamodb-local:{{branch}}'
+    - 'docker.io/saidsef/aws-dynamodb-local:{{branch_slug}}'
   - name: tika-document-to-text
     path: 'deployment/preview'
   - name: scapy-containerised
     path: 'charts/scapy'
     values:
       image:
-        tag: '{{branch}}'
+        tag: '{{branch_slug}}'
   - name: faas-reverse-geocoding
-    path: 'charts/reverse-geocoding'
+    chart: 'reverse-geocoding'
     repoUrl: 'https://saidsef.github.io/faas-reverse-geocoding'
     parameters:
       - name: "image.tag"
-        value: "{{branch}}"
+        value: "{{branch_slug}}"
+      - name: "ingress.enabled"
+        value: "true"
       - name: "ingress.enabled"
         value: "true"
       - name: "ingress.hosts[0].host"
-        value: "{{branch}}"
+        value: "{{branch_slug}}"
 
 # -- GitHub polling rate (seconds)
 requeueAfterSeconds: 500