diff --git a/support/docker/docker-compose.yml b/support/docker/docker-compose.yml
index d328201b1..a9d0fb1e2 100644
--- a/support/docker/docker-compose.yml
+++ b/support/docker/docker-compose.yml
@@ -66,8 +66,14 @@ services:
       - home:/home/${USER}
       - ${HOME}:/mnt
     hostname: nextepc-dev
-    command: /bin/bash -c "chmod 666 /dev/net/tun; /root/setup.sh; su acetcom"
-
+    user: ${USER}
+    entrypoint: /bin/bash -c "/bin/bash -c \"$${@}\""
+    command: |
+        /bin/bash -c "
+            sudo chmod 666 /dev/net/tun
+            sudo /root/setup.sh
+            /bin/bash || exit 0
+        "
 volumes:
   mongodb: {}
   home: {}
diff --git a/support/docker/ubuntu/xenial/base/Dockerfile b/support/docker/ubuntu/xenial/base/Dockerfile
index 71c151d12..b20c1331a 100644
--- a/support/docker/ubuntu/xenial/base/Dockerfile
+++ b/support/docker/ubuntu/xenial/base/Dockerfile
@@ -18,6 +18,7 @@ RUN apt-get update && \
         libgnutls28-dev \
         libgcrypt-dev \
         libssl-dev \
+        libidn11-dev \
         libmongoc-dev \
         libbson-dev \
         libyaml-dev \