diff --git a/docker/build-all.sh b/docker/build-all.sh
index 9178d465a..3116d96dc 100755
--- a/docker/build-all.sh
+++ b/docker/build-all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for os in archlinux debian-buster fedora-34 fedora-35 homebrew opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-18.04 ubuntu-20.04 ubuntu-21.04; do
+for os in archlinux debian-buster fedora-34 fedora-35 homebrew kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-18.04 ubuntu-20.04 ubuntu-21.04; do
   (  cd $os && ./docker_build.sh )
 done
diff --git a/docker/kali/Dockerfile b/docker/kali/Dockerfile
new file mode 100644
index 000000000..10754be7e
--- /dev/null
+++ b/docker/kali/Dockerfile
@@ -0,0 +1,19 @@
+FROM kalilinux/kali-rolling
+
+ENV LANG C
+ENV DEBIAN_FRONTEND noninteractive
+# qtbase5-dev skipped
+RUN apt-get update && \
+    apt-get dist-upgrade -y && \
+    apt-get install -y --no-install-recommends git ca-certificates build-essential cmake pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev libbz2-dev libbluetooth-dev libpython3-dev sudo && \
+    apt-get clean
+
+# Create rrg user
+RUN useradd -ms /bin/bash rrg
+RUN passwd -d rrg
+RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
+
+USER rrg
+WORKDIR "/home/rrg"
+
+CMD ["/bin/bash"]
diff --git a/docker/kali/README.md b/docker/kali/README.md
new file mode 100644
index 000000000..f586fe064
--- /dev/null
+++ b/docker/kali/README.md
@@ -0,0 +1,9 @@
+# Notes to run tests
+
+```
+sudo apt update
+sudo apt install -y python3-minimal
+sudo apt install -y python3-pip
+python3 -m pip install ansicolors sslcrypto
+tools/pm3_tests.sh --long
+```
diff --git a/docker/kali/docker_build.sh b/docker/kali/docker_build.sh
new file mode 100755
index 000000000..59a8a207b
--- /dev/null
+++ b/docker/kali/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-kali:1.0" .
diff --git a/docker/kali/docker_rm.sh b/docker/kali/docker_rm.sh
new file mode 100644
index 000000000..4cc73265d
--- /dev/null
+++ b/docker/kali/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-kali:1.0
+#docker image rm kalilinux/kali-rolling
diff --git a/docker/kali/docker_run.sh b/docker/kali/docker_run.sh
new file mode 100755
index 000000000..5d9dcf13d
--- /dev/null
+++ b/docker/kali/docker_run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-kali:1.0
diff --git a/docker/parrot-core-latest/docker_rm.sh b/docker/parrot-core-latest/docker_rm.sh
index e5b4a9a97..4874bdec5 100644
--- a/docker/parrot-core-latest/docker_rm.sh
+++ b/docker/parrot-core-latest/docker_rm.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 docker image rm pm3-parrotsec-core-latest:1.0
-#docker image rm ubuntu:21.04
+docker image rm parrotsec/core:latest