diff --git a/Dockerfile b/Dockerfile
index afbfe4f..6b722e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ ENV LANG=C.UTF-8
 # users to have it installed (to clone/push/diff projects or libraries).
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -q && apt-get -y -q install --no-install-recommends \
-    ca-certificates git libegl1 libfontconfig1 libglib2.0-0 libglu1-mesa wget xvfb \
+    ca-certificates git libegl1 libfontconfig1 libglib2.0-0 libglu1-mesa wget \
   && rm -rf /var/lib/apt/lists/*
 
 # Install LibrePCB CLI
@@ -20,15 +20,13 @@ RUN wget "https://download.librepcb.org/releases/$LIBREPCB_VERSION/librepcb-$LIB
   && mkdir /opt/librepcb \
   && tar -xvzf librepcb-$LIBREPCB_VERSION-linux-x86_64.tar.gz -C /opt/librepcb --strip-components=1 \
   && rm librepcb-$LIBREPCB_VERSION-linux-x86_64.tar.gz \
-  && rm /opt/librepcb/bin/librepcb
+  && rm /opt/librepcb/bin/librepcb \
+  && ln -s /opt/librepcb/bin/librepcb-cli /usr/local/bin/librepcb-cli
 
 # Set working directory to /work so users don't have to change the working
 # directory when mounting a volume to this path
 WORKDIR /work
 
-# Add wrapper around librepcb-cli to get it run with xvfb-run
-ADD librepcb-cli /usr/local/bin/librepcb-cli
-
 # Check if the librepcb-cli works as expected
 RUN librepcb-cli --version
 
diff --git a/librepcb-cli b/librepcb-cli
deleted file mode 100755
index 3722d57..0000000
--- a/librepcb-cli
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# LibrePCB CLI requires a running X server, as explained in documentation:
-#   https://docs.librepcb.org/#cli-headless
-xvfb-run -a /opt/librepcb/bin/librepcb-cli "$@"