diff --git a/init/docker/docker-compose.env.example b/init/docker/docker-compose.env.example
index 3f412975..882e1657 100644
--- a/init/docker/docker-compose.env.example
+++ b/init/docker/docker-compose.env.example
@@ -1,12 +1,13 @@
-INFLUXDB_USERNAME=admin
-INFLUXDB_PASSWORD=admin
-INFLUXDB_DATABASE=unifi
+INFLUXDB_USER=admin
+INFLUXDB_PASS=influxadmin
+INFLUXDB_DB=unifi
 
 GRAFANA_USERNAME=admin
-GRAFANA_PASSWORD=admin
+GRAFANA_PASSWORD=grafanaadmin
 
-UP_BRANCH=stable
-UP_UNIFI_USER=influx
-UP_UNIFI_PASS=
-UP_UNIFI_URL=https://127.0.0.1:8443
-UP_DEBUG=false
\ No newline at end of file
+# 2 means latest v2 release.
+POLLER_TAG=2
+POLLER_DEBUG=false
+UNIFI_USER=unifipoller
+UNIFI_PASS=set_this_on_your_controller
+UNIFI_URL=https://127.0.0.1:8443
diff --git a/init/docker/docker-compose.yml b/init/docker/docker-compose.yml
index fcdbdddf..cd605823 100644
--- a/init/docker/docker-compose.yml
+++ b/init/docker/docker-compose.yml
@@ -1,3 +1,4 @@
+# This is for unifi-poller v2.
 version: '2'
 services:
   influxdb:
@@ -8,9 +9,9 @@ services:
     volumes:
       - influxdb-storage:/var/lib/influxdb
     environment:
-      - INFLUXDB_DB=${INFLUXDB_DATABASE}
-      - INFLUXDB_ADMIN_USER=${INFLUXDB_USERNAME}
-      - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_PASSWORD}
+      - INFLUXDB_DB=${INFLUXDB_DB}
+      - INFLUXDB_ADMIN_USER=${INFLUXDB_USER}
+      - INFLUXDB_ADMIN_PASSWORD=${INFLUXDB_PASS}
   chronograf:
     image: chronograf:latest
     restart: always
@@ -39,16 +40,16 @@ services:
       - GF_INSTALL_PLUGINS=grafana-clock-panel,natel-discrete-panel,grafana-piechart-panel
   unifi-poller:
     restart: always
-    image: golift/unifi-poller:${UP_BRANCH}
+    image: golift/unifi-poller:${POLLER_TAG}
     environment:
-      - UP_INFLUX_DB=${INFLUXDB_DATABASE}
-      - UP_INFLUX_USER=${INFLUXDB_USERNAME}
-      - UP_INFLUX_PASS=${INFLUXDB_PASSWORD}
-      - UP_INFLUX_URL=http://influxdb:8086
-      - UP_UNIFI_USER=${UP_UNIFI_USER}
-      - UP_UNIFI_PASS=${UP_UNIFI_PASS}
-      - UP_UNIFI_URL=${UP_UNIFI_URL}
-      - UP_DEBUG=${UP_DEBUG}
+      - UP_INFLUXDB_DB=${INFLUXDB_DB}
+      - UP_INFLUXDB_USER=${INFLUXDB_USER}
+      - UP_INFLUXDB_PASS=${INFLUXDB_PASS}
+      - UP_INFLUXDB_URL=http://influxdb:8086
+      - UP_UNIFI_DEFAULT_USER=${UNIFI_USER}
+      - UP_UNIFI_DEFAULT_PASS=${UNIFI_USER}
+      - UP_UNIFI_DEFAULT_URL=${UNIFI_URL}
+      - UP_POLLER_DEBUG=${POLLER_DEBUG}
 volumes:
   influxdb-storage:
   chronograf-storage: