diff --git a/charts/incubator/unifi-poller/.helmignore b/charts/stable/unifi-poller/.helmignore
similarity index 100%
rename from charts/incubator/unifi-poller/.helmignore
rename to charts/stable/unifi-poller/.helmignore
diff --git a/charts/incubator/unifi-poller/CHANGELOG.md b/charts/stable/unifi-poller/CHANGELOG.md
similarity index 100%
rename from charts/incubator/unifi-poller/CHANGELOG.md
rename to charts/stable/unifi-poller/CHANGELOG.md
diff --git a/charts/incubator/unifi-poller/CONFIG.md b/charts/stable/unifi-poller/CONFIG.md
similarity index 100%
rename from charts/incubator/unifi-poller/CONFIG.md
rename to charts/stable/unifi-poller/CONFIG.md
diff --git a/charts/incubator/unifi-poller/Chart.yaml b/charts/stable/unifi-poller/Chart.yaml
similarity index 100%
rename from charts/incubator/unifi-poller/Chart.yaml
rename to charts/stable/unifi-poller/Chart.yaml
diff --git a/charts/incubator/unifi-poller/README.md b/charts/stable/unifi-poller/README.md
similarity index 100%
rename from charts/incubator/unifi-poller/README.md
rename to charts/stable/unifi-poller/README.md
diff --git a/charts/incubator/unifi-poller/helm-values.md b/charts/stable/unifi-poller/helm-values.md
similarity index 100%
rename from charts/incubator/unifi-poller/helm-values.md
rename to charts/stable/unifi-poller/helm-values.md
diff --git a/charts/incubator/unifi-poller/questions.yaml b/charts/stable/unifi-poller/questions.yaml
similarity index 100%
rename from charts/incubator/unifi-poller/questions.yaml
rename to charts/stable/unifi-poller/questions.yaml
diff --git a/charts/incubator/unifi-poller/templates/common.yaml b/charts/stable/unifi-poller/templates/common.yaml
similarity index 100%
rename from charts/incubator/unifi-poller/templates/common.yaml
rename to charts/stable/unifi-poller/templates/common.yaml
diff --git a/charts/incubator/unifi-poller/templates/prometheusrules.yaml b/charts/stable/unifi-poller/templates/prometheusrules.yaml
similarity index 100%
rename from charts/incubator/unifi-poller/templates/prometheusrules.yaml
rename to charts/stable/unifi-poller/templates/prometheusrules.yaml
diff --git a/charts/incubator/unifi-poller/templates/servicemonitor.yaml b/charts/stable/unifi-poller/templates/servicemonitor.yaml
similarity index 100%
rename from charts/incubator/unifi-poller/templates/servicemonitor.yaml
rename to charts/stable/unifi-poller/templates/servicemonitor.yaml
diff --git a/charts/incubator/unifi-poller/values.yaml b/charts/stable/unifi-poller/values.yaml
similarity index 59%
rename from charts/incubator/unifi-poller/values.yaml
rename to charts/stable/unifi-poller/values.yaml
index f37ba213f54..37522486300 100644
--- a/charts/incubator/unifi-poller/values.yaml
+++ b/charts/stable/unifi-poller/values.yaml
@@ -4,12 +4,12 @@ image:
   # -- Image [k8s pull policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images).
   pullPolicy: IfNotPresent
   # -- Image tag to deploy.
-  tag: 2.1.3
+  tag: 2.1.3@sha256:8cd99d3eaeee316cbd9bb50c29a55b042fe1c7844f8e44ed19b7eaa6071e8df7
 
 
 # -- Environment variable configuration options for unifi-poller ([docs](https://unifipoller.com/docs/install/configuration)).
 #    Note: a [configuration file](https://github.com/unifi-poller/unifi-poller/blob/master/examples/up.conf.example) is also supported.
-env: {}
+env:
   # TZ: UTC
   # UP_UNIFI_DEFAULT_URL: "https://127.0.0.1:8443"
   # UP_UNIFI_DEFAULT_USER: "unifipoller"
@@ -27,30 +27,6 @@ service:
         protocol: TCP
         port: 9130
 
-ingress:
-  main:
-    # -- Expose [unifi-poller's web interface](https://unifipoller.com/docs/advanced/webserver)
-    #    (if enabled in the configuration) via the k8s ingress by setting this true.
-    enabled: false
-
-influxdb:
-  # -- Create an InfluxDB instance as a [unifi-poller storage backend](https://unifipoller.com/docs/dependencies/influxdb).
-  #    See [bitnami/influxdb](https://github.com/bitnami/charts/tree/master/bitnami/influxdb) for more options.
-  enabled: false
-  # -- InfluxDB cluster deployment architecture.
-  architecture: standalone
-  # -- Database name to automatically initialize.
-  #    Be sure to match in unifi-poller's [influxdb config](https://unifipoller.com/docs/install/configuration#influxdb).
-  database: unifi
-  # -- Enable InfluxDB authentication, supported by unifi-poller.
-  #    Be sure to match in unifi-poller's [influxdb config](https://unifipoller.com/docs/install/configuration#influxdb).
-  authEnabled: false
-  persistence:
-    # -- Enable persistence to store in a PV so data survives pod restarts.
-    enabled: false
-    # storageClass: ""
-    # size: 8Gi
-
 metrics:
   # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
   # @default -- See values.yaml