diff --git a/.scripts/supervisord.conf b/.scripts/supervisord.conf
index 9b12c64c..a7571015 100644
--- a/.scripts/supervisord.conf
+++ b/.scripts/supervisord.conf
@@ -1,12 +1,12 @@
 [supervisord]
-user=netris
+user=ubuntu
 nodaemon=true
 loglevel=info
 logfile=/tmp/supervisord.log
 pidfile=/tmp/supervisord.pid
 
 [program:entrypoint]
-command=/usr/bin/netris/entrypoint.sh
+command=/etc/entrypoint.sh
 logfile=/tmp/entrypoint.log
 pidfile=/tmp/entrypoint.pid
 stopsignal=INT
@@ -16,7 +16,7 @@ redirect_stderr=true
 priority=1
 
 [program:pulseaudio]
-user=netris
+user=ubuntu
 command=bash -c "until [ -S \"/tmp/.X11-unix/X${DISPLAY/:/}\" ]; do sleep 1; done; sudo /usr/bin/pulseaudio -k >/dev/null 2>&1 || sudo /usr/bin/pulseaudio --system --verbose --log-target=stderr --realtime=true --disallow-exit -L 'module-native-protocol-tcp auth-ip-acl=127.0.0.0/8 port=4713 auth-anonymous=1'"
 environment=DISPLAY=":0"
 logfile=/tmp/pulseaudio.log
diff --git a/server.Dockerfile b/server.Dockerfile
index 790e2eea..c73a2027 100644
--- a/server.Dockerfile
+++ b/server.Dockerfile
@@ -42,7 +42,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 
 COPY warp /usr/bin/netris/
 RUN chmod +x /usr/bin/netris/warp
-COPY .scripts/entrypoint.sh .scripts/supervisord.conf /etc/netris/
+COPY .scripts/entrypoint.sh .scripts/supervisord.conf /etc/
 RUN chmod 755 /etc/supervisord.conf /etc/entrypoint.sh
 
 USER 1000