diff --git a/tools/precommit/Dockerfile b/tools/precommit/Dockerfile
index c78ad7171b..2eea553e69 100644
--- a/tools/precommit/Dockerfile
+++ b/tools/precommit/Dockerfile
@@ -30,7 +30,7 @@ RUN ln -s /opt/cp2k-precommit/node_modules/markdownlint-cli/markdownlint.js /usr
 # Install black, flask, gunicorn, and dependencies.
 # https://github.com/psf/black
 COPY requirements.txt .
-RUN pip3 install -r requirements.txt
+RUN pip3 install --quiet -r requirements.txt
 
 # Clone cp2k repository (needed for CI mode).
 RUN git clone --quiet --recursive --single-branch -b master https://github.com/cp2k/cp2k.git /workspace/cp2k
diff --git a/tools/precommit/entrypoint.sh b/tools/precommit/entrypoint.sh
index 262415868f..e1210b4aaf 100755
--- a/tools/precommit/entrypoint.sh
+++ b/tools/precommit/entrypoint.sh
@@ -10,19 +10,22 @@ if [ -z "${GIT_REF}" ]; then
     wait  # Can be interrupted with ctrl-C.
 else
     # CI mode.
-    echo -e "\n========== Starting Precommit Server =========="
-    gunicorn --bind=:8080 --workers=1 --threads=8 --timeout=0 precommit_server:app &> server.logs &
-    sleep 3
-    cat server.logs
     echo -e "\n========== Fetching Git Commit =========="
     cd /workspace/cp2k
     git fetch --quiet origin "${GIT_BRANCH}"
     git reset --quiet --hard "${GIT_REF}"
     git submodule update --init --recursive
     git --no-pager log -1 --pretty='%nCommitSHA: %H%nCommitTime: %ci%nCommitAuthor: %an%nCommitSubject: %s%n'
+
+    echo -e "\n========== Starting Precommit Server =========="
+    cd ./tools/precommit/
+    gunicorn --bind=:8080 --workers=1 --threads=8 --timeout=0 precommit_server:app &> server.logs &
+    sleep 3
+    cat server.logs
+
     echo -e "\n========== Running Precommit Checks =========="
     export CP2K_PRECOMMIT_SERVER="http://127.0.0.1:8080"
-    ./tools/precommit/precommit.py --no-cache --progressbar-wait=10 || true
+    ./precommit.py --no-cache --progressbar-wait=10 || true
 fi
 
 #EOF
diff --git a/tools/precommit/precommit.py b/tools/precommit/precommit.py
index 419695da9a..62f52474a5 100755
--- a/tools/precommit/precommit.py
+++ b/tools/precommit/precommit.py
@@ -69,7 +69,7 @@ def main():
 
     # Store candidate before changing base directory and creating scratch dir.
     candidate_file_list = [os.path.abspath(fn) for fn in args.files]
-    base_dir = Path(__file__).parent.parent.parent.resolve()
+    base_dir = Path(__file__).resolve().parent.parent.parent
     os.chdir(base_dir)
     SCRATCH_DIR.mkdir(parents=True, exist_ok=True)