diff --git a/docker/ubuntu-18.04/README.md b/docker/ubuntu-18.04/README.md
index c6fce658c..f586fe064 100644
--- a/docker/ubuntu-18.04/README.md
+++ b/docker/ubuntu-18.04/README.md
@@ -2,8 +2,8 @@
 
 ```
 sudo apt update
-sudo apt install python3-minimal
-sudo apt install python3-pip
+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/ubuntu-20.04/README.md b/docker/ubuntu-20.04/README.md
new file mode 100644
index 000000000..f586fe064
--- /dev/null
+++ b/docker/ubuntu-20.04/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/ubuntu-21.04/Dockerfile b/docker/ubuntu-21.04/Dockerfile
new file mode 100644
index 000000000..98b2ae7e4
--- /dev/null
+++ b/docker/ubuntu-21.04/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:21.04
+
+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/ubuntu-21.04/README.md b/docker/ubuntu-21.04/README.md
new file mode 100644
index 000000000..f586fe064
--- /dev/null
+++ b/docker/ubuntu-21.04/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/ubuntu-21.04/docker_build.sh b/docker/ubuntu-21.04/docker_build.sh
new file mode 100755
index 000000000..70e0349f8
--- /dev/null
+++ b/docker/ubuntu-21.04/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu-21.04:1.0" .
diff --git a/docker/ubuntu-21.04/docker_rm.sh b/docker/ubuntu-21.04/docker_rm.sh
new file mode 100644
index 000000000..bb848bfe0
--- /dev/null
+++ b/docker/ubuntu-21.04/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-ubuntu-21.04:1.0
+docker image rm ubuntu:21.04
diff --git a/docker/ubuntu-21.04/docker_run.sh b/docker/ubuntu-21.04/docker_run.sh
new file mode 100755
index 000000000..ddd958144
--- /dev/null
+++ b/docker/ubuntu-21.04/docker_run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu-21.04:1.0