diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index d6eb7fd367..341aeb0b03 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -34,4 +34,4 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
 
-USER nova
+# TODO(coolsvap/nihilifer): Run libvirt daemon as non-root user.