diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index dbfb255..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM node:buster-slim
-MAINTAINER Glenn ROLLAND <glenux@glenux.net>
-
-RUN apt-get update && \
-	apt-get install -y make python build-essential
-
-COPY . /app
-WORKDIR /app
-RUN make prepare
-CMD make watch
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..9bc2a5e
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,21 @@
+FROM node:bullseye-slim
+MAINTAINER Glenn ROLLAND <glenux@glenux.net>
+
+RUN apt-get update && \
+	apt-get install -y make build-essential
+
+RUN apt-get update && \
+	apt-get install -y python3 python3-pip
+
+RUN pip3 install pipenv
+
+COPY . /app
+WORKDIR /app
+
+ENV LANG=C
+ENV LC_ALL=C
+
+RUN make prepare
+
+ENTRYPOINT ["/app/docker/entrypoint.sh"]
+CMD ["watch"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100755
index 0000000..d07ddf9
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+ARGS="$*"
+echo "Arguments: $ARGS"
+
+make "$0"