diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml
index 77f242f6..99f1c2eb 100644
--- a/docker-compose.frontend.yml
+++ b/docker-compose.frontend.yml
@@ -5,7 +5,7 @@ version: '3'
 
 services:
   kobocat:
-    image: kobotoolbox/kobocat:2.021.45
+    image: kobotoolbox/kobocat:2.021.47
     hostname: kobocat
     env_file:
       - ../kobo-env/envfile.txt
@@ -44,7 +44,7 @@ services:
           - kobocat.internal
 
   kpi:
-    image: kobotoolbox/kpi:2.021.45b
+    image: kobotoolbox/kpi:2.021.47
     hostname: kpi
     env_file:
       - ../kobo-env/envfile.txt
diff --git a/uwsgi/kpi_uwsgi.ini b/uwsgi/kpi_uwsgi.ini
index 27395f34..ee1b45d8 100644
--- a/uwsgi/kpi_uwsgi.ini
+++ b/uwsgi/kpi_uwsgi.ini
@@ -62,8 +62,8 @@ socket          = 0.0.0.0:8000
 buffer-size     = 32768
 listen          = @(/proc/sys/net/core/somaxconn)
 
-#uid             = wsgi
-#gid             = wsgi
+uid             = $(UWSGI_USER)
+gid             = $(UWSGI_GROUP)
 die-on-term     = true
 
 # uWSGI does not pass locale information to the application by default