diff --git a/Dockerfile b/Dockerfile
index 5826661..db863cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,5 +23,4 @@ RUN useradd --user-group --create-home --home-dir /app --shell /bin/false app
 
 RUN [ -e ./install_deps.sh ] && ./install_deps.sh
 
-# USER app
-CMD ["node","app.js"]
+ENTRYPOINT ["/bin/sh", "entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 2469482..e6af23b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     extends:
       file: docker-compose-config.yml
       service: dev
-    entrypoint: npm run test:acceptance
+    command: npm run test:acceptance
 
   redis:
     image: redis
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..588854e
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Changing permissions of /var/run/docker.sock for sibling containers"
+chown root:docker /var/run/docker.sock
+exec runuser -u app "$@"
\ No newline at end of file