diff --git a/ci-deadlock-cli/Dockerfile b/ci-deadlock-cli/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..d97d77e23e71619768c27d19644a3de939db7a16
--- /dev/null
+++ b/ci-deadlock-cli/Dockerfile
@@ -0,0 +1,12 @@
+FROM docker:18.09.6-dind
+
+RUN apk add --update python3-dev py-pip gcc musl-dev
+RUN pip3 install --upgrade pip
+RUN pip3 install deadlock-cli
+
+RUN mkdir -p ~/.docker
+
+RUN echo -e "\033[33mInstalling experimental feature to use (docker manifest inspect), can be change in the future.\033[0m"
+RUN echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+
+
diff --git a/ci-deadlock-cli/README.md b/ci-deadlock-cli/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..47d196a87f4d18bb264960c14b5c0de19156f917
--- /dev/null
+++ b/ci-deadlock-cli/README.md
@@ -0,0 +1,13 @@
+# Deadlock cli
+
+This Dockerfile installs deadlock-cli inside a docker-in-docker container
+
+# Steps to upgrade image
+
+```bash
+$ NEW_VERSION=x.y
+$ docker build -t ci-deadlock-cli:$NEW_VERSION .
+$ docker tag ci-deadlock-cli:$NEW_VERSION registry.e-biz.fr/apuret/deadlock-public/ci-deadlock-cli:$NEW_VERSION
+$ docker login registry.e-biz.fr/apuret/deadlock-public/
+$ docker push registry.e-biz.fr/apuret/deadlock-public/ci-deadlock-cli:$NEW_VERSION
+```