diff --git a/services/git-bridge/.dockerignore b/services/git-bridge/.dockerignore
index 1314e8beb5..e49947d0fd 100644
--- a/services/git-bridge/.dockerignore
+++ b/services/git-bridge/.dockerignore
@@ -2,4 +2,5 @@
 !/lib
 !/src/main
 !/pom.xml
+!/Makefile
 !/LICENSE
diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index 0ac29b4e32..341535c451 100644
--- a/services/git-bridge/Dockerfile
+++ b/services/git-bridge/Dockerfile
@@ -1,11 +1,18 @@
 # Dockerfile for git-bridge
 
-FROM maven:3-jdk-8
+FROM maven:3-jdk-8 as base
+
+RUN apt-get update && apt-get install -y make \
+ && rm -rf /var/lib/apt/lists
+
+RUN useradd --create-home node
+
+FROM base as builder
 
 WORKDIR /app
 
 COPY . /app
-RUN mvn clean package \
+RUN make package \
 # The name of the created jar contains the current version tag.
 # Rename it to a static path that can be used for copying.
 &&  find /app/target \
@@ -14,15 +21,14 @@ RUN mvn clean package \
 
 FROM openjdk:8-jre
 
-RUN apt-get update \
- && apt-get install --no-install-recommends -y \
-      git \
- && rm -rf \
-      /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git \
+ && rm -rf /var/lib/apt/lists
 
-USER www-data
+RUN useradd --create-home node
 
 ENTRYPOINT ["java", "-jar", "/git-bridge.jar"]
 CMD ["/conf/runtime.json"]
 
-COPY --from=0 /git-bridge.jar /
+COPY --from=builder /git-bridge.jar /
+
+USER node