diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml
index 4336ec6..ecfc0a9 100644
--- a/roles/unifi/defaults/main.yml
+++ b/roles/unifi/defaults/main.yml
@@ -1,5 +1,5 @@
 unifi_version: latest
-unifi_container_image: lscr.io/linuxserver/unifi-controller
+unifi_container_image: git.pyrocufflink.net/containerimages/unifi
 unifi_storage_path: /var/lib/unifi
 
 unifi_exporter_container_image: docker.io/jessestuart/unifi_exporter
diff --git a/roles/unifi/templates/unifi.container.j2 b/roles/unifi/templates/unifi.container.j2
index ee51929..a3e3f40 100644
--- a/roles/unifi/templates/unifi.container.j2
+++ b/roles/unifi/templates/unifi.container.j2
@@ -8,7 +8,8 @@ Image={{ unifi_container_image }}:{{ unifi_version }}
 Volume={{ unifi_storage_path }}:/config:rw,Z
 Network=host
 NoNewPrivileges=yes
-UserNS=auto:gidmapping=911:911:1,uidmapping=911:911:1
+User=911
+Group=911
 VolatileTmp=yes
 Notify=yes