diff --git a/charts/unifi-poller/Chart.yaml b/charts/unifi-poller/Chart.yaml
index 19777934..e32cdee1 100644
--- a/charts/unifi-poller/Chart.yaml
+++ b/charts/unifi-poller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.1
 description: Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus
 name: unifi-poller
-version: 3.3.0
+version: 4.0.0
 keywords:
   - unifi
   - unifi-poller
@@ -18,3 +18,7 @@ dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
     version: 1.7.0
+  - name: influxdb
+    version: 1.0.0
+    repository: https://charts.bitnami.com/bitnami
+    condition: influxdb.enabled
diff --git a/charts/unifi-poller/templates/common.yaml b/charts/unifi-poller/templates/common.yaml
index e89dd659..a6613c2c 100644
--- a/charts/unifi-poller/templates/common.yaml
+++ b/charts/unifi-poller/templates/common.yaml
@@ -1,31 +1 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "common.values.setup" . }}
-
-{{/* Append the configMap to the additionalVolumes */}}
-{{- define "unifi-poller.configmap.volume" -}}
-name: unifi-poller-settings
-configMap:
-  name: {{ template "common.names.fullname" . }}-settings
-{{- end -}}
-
-{{- $volume := include "unifi-poller.configmap.volume" . | fromYaml -}}
-{{- if $volume -}}
-    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
-    {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
-{{- end -}}
-
-{{/* Append the configMap volume to the additionalVolumeMounts */}}
-{{- define "unifi-poller.configmap.volumeMount" -}}
-name: unifi-poller-settings
-mountPath: /config/unifi-poller.yaml
-subPath: unifi-poller.yaml
-{{- end -}}
-
-{{- $volumeMount := include "unifi-poller.configmap.volumeMount" . | fromYaml -}}
-{{- if $volumeMount -}}
-    {{- $additionalVolumeMounts := append .Values.additionalVolumeMounts $volumeMount }}
-    {{- $_ := set .Values "additionalVolumeMounts" (deepCopy $additionalVolumeMounts) -}}
-{{- end -}}
-
-{{/* Render the templates */}}
 {{ include "common.all" . }}
diff --git a/charts/unifi-poller/templates/configmap.yaml b/charts/unifi-poller/templates/configmap.yaml
deleted file mode 100644
index 2d02e6a4..00000000
--- a/charts/unifi-poller/templates/configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "common.names.fullname" . }}-settings
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-data:
-  unifi-poller.yaml: |
-  {{- with .Values.config }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
diff --git a/charts/unifi-poller/values.yaml b/charts/unifi-poller/values.yaml
index d91fd5a5..e32c386f 100644
--- a/charts/unifi-poller/values.yaml
+++ b/charts/unifi-poller/values.yaml
@@ -12,6 +12,16 @@ service:
   port:
     port: 9130
 
+# # See more environment varaibles in the unifi-poller documentation
+# https://github.com/unifi-poller/unifi-poller/wiki/Configuration
+env: {}
+  # TZ: UTC
+  # UP_UNIFI_DEFAULT_URL: "https://127.0.0.1:8443"
+  # UP_UNIFI_DEFAULT_USER: "unifipoller"
+  # UP_UNIFI_DEFAULT_PASS: "unifipoller"
+  # UP_PROMETHEUS_DISABLE: true
+  # UP_INFLUXDB_DISABLE: true
+
 # enable a prometheus-operator servicemonitor
 prometheus:
   serviceMonitor:
@@ -19,92 +29,14 @@ prometheus:
     interval: 1m
     additionalLabels: {}
 
-# unifi-poller configuration settings
-# https://github.com/unifi-poller/unifi-poller/wiki/Configuration
-config:
-  poller:
-    # config.poller.debug -- Turns on line numbers, microsecond logging, and a per-device log.
-    # The default is false, but I personally leave this on at home (four devices).
-    # This may be noisy if you have a lot of devices. It adds one line per device.
-    debug: false
-    # config.poller.quiet -- Turns off per-interval logs. Only startup and error logs will be emitted.
-    # Recommend enabling debug with this setting for better error logging.
-    quiet: false
-    # config.poller.plugins -- Load dynamic plugins. Advanced use; only sample mysql plugin provided by default.
-    plugins: []
-
-  #### OUTPUTS
-  prometheus:
-    # config.prometheus.disable -- Disable prometheus output
-    disable: false
-    # config.prometheus.http_listen -- This controls on which ip and port /metrics is exported when mode is "prometheus".
-    # This has no effect in other modes. Must contain a colon and port.
-    http_listen: "0.0.0.0:9130"
-    # config.prometheus.requests --
-    report_errors: false
-
-  influxdb:
-    # config.influxdb.disable -- Disable prometheus output
-    disable: true
-    # config.influxdb.interval --
-    interval: "30s"
-    # config.influxdb.url -- InfluxDB does not require auth by default, so the user/password are probably unimportant.
-    url: "http://127.0.0.1:8086"
-    # config.influxdb.user --
-    user: "unifipoller"
-    # config.influxdb.pass --
-    pass: "unifipoller"
-    # config.influxdb.pass -- Be sure to create this database.
-    db: "unifi"
-    # config.influxdb.verify_ssl --  The UniFi Controller only updates traffic stats about every 30 seconds.
-    # Setting this to something lower may lead to "zeros" in your data.
-    # If you're getting zeros now, set this to "1m"
-    verify_ssl: false
-
-  #### Inputs
-  unifi:
-    # config.unifi.dynamic -- Setting this to true and providing default credentials allows you to skip
-    # configuring controllers in this config file. Instead you configure them in
-    # your prometheus.yml config. Prometheus then sends the controller URL to
-    # unifi-poller when it performs the scrape. This is useful if you have many,
-    # or changing controllers. Most people can leave this off. See wiki for more.
-    dynamic: false
-    # config.unifi.defaults -- The following section contains the default credentials/configuration for any
-    # dynamic controller (see above section), or the primary controller if you do not
-    # provide one and dynamic is disabled. In other words, you can just add your
-    # controller here and delete the following section.
-    defaults:
-      # config.unifi.defaults.role -- Friendly name used in dashboards. Uses URL if left empty; which is fine.
-      # Avoid changing this later because it will live forever in your database.
-      # Multiple controllers may share a role. This allows grouping during scrapes.
-      role: "main controller"
-      # config.unifi.defaults.role -- Username to talk to unifi
-      user: "unifipoller"
-      # config.unifi.defaults.pass -- Password to talk to unifi
-      pass: "unifipoller"
-      # config.unifi.defaults.url -- Url to talk to unifi
-      url: "https://127.0.0.1:8443"
-      # config.unifi.defaults.sites -- If the controller has more than one site, specify which sites to poll here.
-      # Set this to ["default"] to poll only the first site on the controller.
-      # A setting of ["all"] will poll all sites; this works if you only have 1 site too.
-      sites:
-        - all
-      # config.unifi.defaults.verify_ssl -- If your UniFi controller has a valid SSL certificate (like lets encrypt),
-      # you can enable this option to validate it. Otherwise, any SSL certificate is
-      # valid. If you don't know if you have a valid SSL cert, then you don't have one
-      verify_ssl: false
-      # config.unifi.defaults.save_ids -- Enable collection of Intrusion Detection System Data (InfluxDB only).
-      # Only useful if IDS or IPS are enabled on one of the sites.
-      save_ids: false
-      # config.unifi.defaults.save_dpi -- Enable collection of Deep Packet Inspection data. This data breaks down traffic
-      # types for each client and site, it powers a dedicated DPI dashboard.
-      # Enabling this adds roughly 150 data points per client.  That's 6000 metrics for
-      # 40 clients.  This adds a little bit of poller run time per interval and causes
-      # more API requests to your controller(s). Don't let these "cons" sway you:
-      # it's cool data. Please provide feedback on your experience with this feature.
-      save_dpi: false
-      # config.unifi.defaults.save_sites -- Enable collection of site data. This data powers the Network Sites dashboard.
-      # It's not valuable to everyone and setting this to false will save resources.
-      save_sites: true
-    # config.unifi.controllers -- Repeat any controllers like default above
-    controllers: []
+# Enable influxdb
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/influxdb
+influxdb:
+  enabled: false
+  architecture: standalone
+  database: unifi_poller
+  authEnabled: false
+  persistence:
+    enabled: false
+    # storageClass: ""
+    # size: 8Gi