diff --git a/Chart.yaml b/Chart.yaml
index d4378a2..b2b1d94 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.1
+version: 0.3.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/index.yaml b/index.yaml
index 64b9774..6a92ebb 100644
--- a/index.yaml
+++ b/index.yaml
@@ -3,7 +3,23 @@ entries:
   netmaker:
   - apiVersion: v2
     appVersion: 0.14.5
-    created: "2023-01-02T16:04:41.733675-03:00"
+    created: "2023-01-02T16:30:22.510747-03:00"
+    dependencies:
+    - condition: postgresql-ha.enabled
+      name: postgresql-ha
+      repository: https://charts.bitnami.com/bitnami
+      version: 7.11.0
+    description: A Helm chart to run HA Netmaker on Kubernetes
+    digest: 5a8e7af27b72bf14df443d784d878f8b1eaf8877ff5484ff6c20a473fba5ee70
+    icon: https://raw.githubusercontent.com/gravitl/netmaker/master/netclient/windowsdata/resource/netclient.ico
+    name: netmaker
+    type: application
+    urls:
+    - netmaker-0.3.2.tgz
+    version: 0.3.2
+  - apiVersion: v2
+    appVersion: 0.14.5
+    created: "2023-01-02T16:30:22.498589-03:00"
     dependencies:
     - condition: postgresql-ha.enabled
       name: postgresql-ha
@@ -19,7 +35,7 @@ entries:
     version: 0.3.1
   - apiVersion: v2
     appVersion: 0.14.5
-    created: "2023-01-02T16:04:41.725325-03:00"
+    created: "2023-01-02T16:30:22.488157-03:00"
     dependencies:
     - name: postgresql-ha
       repository: https://charts.bitnami.com/bitnami
@@ -34,7 +50,7 @@ entries:
     version: 0.3.0
   - apiVersion: v2
     appVersion: 0.14.5
-    created: "2023-01-02T16:04:41.714291-03:00"
+    created: "2023-01-02T16:30:22.477009-03:00"
     dependencies:
     - name: postgresql-ha
       repository: https://charts.bitnami.com/bitnami
@@ -52,7 +68,7 @@ entries:
       category: Database
     apiVersion: v2
     appVersion: 11.13.0
-    created: "2023-01-02T16:04:41.73618-03:00"
+    created: "2023-01-02T16:30:22.513389-03:00"
     dependencies:
     - name: common
       repository: https://charts.bitnami.com/bitnami
@@ -82,4 +98,4 @@ entries:
     urls:
     - charts/postgresql-ha-7.11.0.tgz
     version: 7.11.0
-generated: "2023-01-02T16:04:41.70919-03:00"
+generated: "2023-01-02T16:30:22.471932-03:00"
diff --git a/netmaker-0.3.2.tgz b/netmaker-0.3.2.tgz
new file mode 100644
index 0000000..ca6fb36
Binary files /dev/null and b/netmaker-0.3.2.tgz differ
diff --git a/templates/netmaker-statefulset.yaml b/templates/netmaker-statefulset.yaml
index 024777e..0f9419c 100644
--- a/templates/netmaker-statefulset.yaml
+++ b/templates/netmaker-statefulset.yaml
@@ -70,7 +70,11 @@ spec:
               apiVersion: v1
               fieldPath: metadata.name
         - name: SQL_HOST
+          {{- if .Values.postgresql-ha.enabled }}
           value: '{{ .Release.Name }}-postgresql-ha-pgpool.{{ .Release.Namespace }}.svc.cluster.local'
+          {{- else }}
+          value: {{ .Values.wireguard.dbHost }}
+          {{- end }}
         - name: SQL_PORT
           value: "5432"
         - name: SQL_DB