diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 829f4640..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.git
-console/frontend/node_modules/
diff --git a/.github/workflows/ipinfo.yml b/.github/workflows/ipinfo.yml
index 6ff2fdb9..3cb84870 100644
--- a/.github/workflows/ipinfo.yml
+++ b/.github/workflows/ipinfo.yml
@@ -31,7 +31,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - uses: docker/build-push-action@v6
         with:
-          context: docker
+          context: .
           file: docker/Dockerfile.ipinfo-geoipupdate
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
diff --git a/Makefile b/Makefile
index d4609bf9..2ef9f369 100644
--- a/Makefile
+++ b/Makefile
@@ -286,8 +286,8 @@ version:
 .PHONY: docker docker-dev
 DOCKER_BUILD_ARGS =
 docker: ; $(info $(M) build Docker image…) @ ## Build Docker image
-	$Q docker build --pull -f docker/Dockerfile $(DOCKER_BUILD_ARGS) \
-		--build-arg VERSION=$(VERSION) -t ghcr.io/akvorado/akvorado:main .
+	$Q git ls-files | tar -T- -cf- | docker build --pull -f docker/Dockerfile $(DOCKER_BUILD_ARGS) \
+		--build-arg VERSION=$(VERSION) -t ghcr.io/akvorado/akvorado:main -
 docker-dev: TARGETOS=linux
 docker-dev: all ; $(info $(M) build development Docker image…) @ ## Build development Docker image
 	$Q docker build -f docker/Dockerfile.dev $(DOCKER_BUILD_ARGS) \
diff --git a/docker/Dockerfile.dev.dockerignore b/docker/Dockerfile.dev.dockerignore
new file mode 100644
index 00000000..bb84267f
--- /dev/null
+++ b/docker/Dockerfile.dev.dockerignore
@@ -0,0 +1,2 @@
+*
+!bin/akvorado
diff --git a/docker/Dockerfile.dockerignore b/docker/Dockerfile.dockerignore
new file mode 100644
index 00000000..6b8710a7
--- /dev/null
+++ b/docker/Dockerfile.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/docker/Dockerfile.ipinfo-geoipupdate b/docker/Dockerfile.ipinfo-geoipupdate
index ffc367ad..899a919f 100644
--- a/docker/Dockerfile.ipinfo-geoipupdate
+++ b/docker/Dockerfile.ipinfo-geoipupdate
@@ -5,7 +5,7 @@ RUN apk add --no-cache curl
 WORKDIR /data
 VOLUME /data
 
-COPY --chmod=555 ipinfo-geoipupdate.sh /usr/local/bin/ipinfo-geoipupdate.sh
+COPY --chmod=555 docker/ipinfo-geoipupdate.sh /usr/local/bin/ipinfo-geoipupdate.sh
 
 LABEL org.opencontainers.image.description="IPinfo database updater"
 HEALTHCHECK --interval=20s CMD test -f /tmp/healthy
diff --git a/docker/Dockerfile.ipinfo-geoipupdate.dockerignore b/docker/Dockerfile.ipinfo-geoipupdate.dockerignore
new file mode 100644
index 00000000..34eb2ee3
--- /dev/null
+++ b/docker/Dockerfile.ipinfo-geoipupdate.dockerignore
@@ -0,0 +1,2 @@
+*
+!docker/ipinfo-geoipupdate.sh