diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1fca41165e8e16189d7bf5d590b36f184da62e88..71699c03f5cc3fe7883e93f2eb47338f0f58868f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,10 @@ test:install:
     - cd /home/gdk
     - gdk init
     - cd gitlab-development-kit
+    - netstat -lpt
     - gdk install
     - support/set-gitlab-upstream
+    - killall node
     - gdk run &
     - sleep 10
     - curl -f http://127.0.0.1:3000/
diff --git a/Dockerfile b/Dockerfile
index e512c750322b1792d72dc46d76eaffe6f9d0a2ba..e710c3e38e79b67154f0247ab95806b158c22110 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,11 +21,15 @@ RUN apt-get install -y git postgresql postgresql-contrib libpq-dev redis-server
   libicu-dev cmake g++ nodejs libkrb5-dev golang ed pkg-config libsqlite3-dev \
   libreadline-dev npm sudo nodejs-legacy
 
-# Install rbenv
+# GDK tools
+RUN apt-get install -y net-tools psmisc
 
-RUN adduser --disabled-password --gecos "" gdk
+# Add GDK user
+RUN useradd --user-group --create-home gdk
 
 USER gdk
+
+# Install rbenv
 RUN git clone https://github.com/sstephenson/rbenv.git /home/gdk/.rbenv
 RUN echo 'export PATH="/home/gdk/.rbenv/bin:$PATH"' >> /home/gdk/.bash_profile
 RUN echo 'eval "$(rbenv init -)"' >> /home/gdk/.bash_profile