diff --git a/docker-compose.yml b/docker-compose.yml
index 0de36bb..7c517f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,23 +1,22 @@
 version: '3'
 
 volumes:
   jenkins_data:
 
 
 services:
   jenkins:
     image: swh-jenkins:latest
-    build:
-      context: docker
-      args:
-        DOCKER_GROUP: 998
+    build: ./docker
     volumes:
       - jenkins_data:/var/jenkins_home
       - /var/run/docker.sock:/var/run/docker.sock
       - .:/opt/swh-jenkins-jobs
+      - ./docker:/docker
+      - ./docker/jenkins_jobs.ini:/etc/jenkins_jobs/jenkins_jobs.ini
     environment:
       - PLUGINS_FORCE_UPGRADE=true
       - JAVA_OPTS=-Dhudson.plugins.git.GitSCM.ALLOW_LOCAL_CHECKOUT=true
     ports:
       - 8080:8080
     entrypoint: /docker/entrypoint.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 71e8f22..2bd25fe 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,28 +1,22 @@
 FROM jenkins/jenkins:lts-jdk11
 
 USER root
 
 RUN apt-get update && apt-get -y install python3-pip && \
     pip install tox
 
 # Adapt this group if the docker gid is not 999 on your local environment
-ARG DOCKER_GROUP 998
+ARG DOCKER_GROUP=998
 
 # Install docker tools
 RUN addgroup --gid ${DOCKER_GROUP} docker && \
     mkdir -p /etc/apt/keyrings /etc/apt/sources.list.d && \
     apt-get update && apt-get -y install ca-certificates curl gnupg lsb-release && \
     curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
     echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \
     apt-get update && \
     apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
 
-COPY --chown=jenkins:jenkins . /docker/
-COPY jenkins_jobs.ini /etc/jenkins_jobs/jenkins_jobs.ini
-
-RUN adduser jenkins docker && \
-    chmod a+x /docker/entrypoint.sh
+RUN adduser jenkins docker
 
 USER jenkins
-
-ENTRYPOINT /docker/entrypoint.sh
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
old mode 100644
new mode 100755