diff --git a/docker/build-all.sh b/docker/build-all.sh
index bb49f5144..9d95944da 100755
--- a/docker/build-all.sh
+++ b/docker/build-all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for os in archlinux debian fedora homebrew opensuse ubuntu; do
+for os in archlinux debian-buster fedora-34 homebrew opensuse-leap opensuse-tumbleweed ubuntu-18.04 ubuntu-20.04; do
   (  cd $os && ./docker_build.sh )
 done
diff --git a/docker/debian/Dockerfile b/docker/debian-buster/Dockerfile
similarity index 100%
rename from docker/debian/Dockerfile
rename to docker/debian-buster/Dockerfile
diff --git a/docker/debian-buster/docker_build.sh b/docker/debian-buster/docker_build.sh
new file mode 100755
index 000000000..3224e9514
--- /dev/null
+++ b/docker/debian-buster/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-debian-buster:1.0" .
diff --git a/docker/debian/docker_rm.sh b/docker/debian-buster/docker_rm.sh
similarity index 51%
rename from docker/debian/docker_rm.sh
rename to docker/debian-buster/docker_rm.sh
index 5dc0b3be7..bea4fda65 100644
--- a/docker/debian/docker_rm.sh
+++ b/docker/debian-buster/docker_rm.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-debian:1.0
+docker image rm pm3-debian-buster:1.0
 docker image rm buster-slim
diff --git a/docker/debian/docker_run.sh b/docker/debian-buster/docker_run.sh
similarity index 83%
rename from docker/debian/docker_run.sh
rename to docker/debian-buster/docker_run.sh
index faf35d849..afb7e9450 100755
--- a/docker/debian/docker_run.sh
+++ b/docker/debian-buster/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-debian:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-debian-buster:1.0
diff --git a/docker/debian/docker_build.sh b/docker/debian/docker_build.sh
deleted file mode 100755
index b051aaf7c..000000000
--- a/docker/debian/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-debian:1.0" .
diff --git a/docker/fedora/Dockerfile b/docker/fedora-34/Dockerfile
similarity index 95%
rename from docker/fedora/Dockerfile
rename to docker/fedora-34/Dockerfile
index db634fc0d..6ba5676b1 100644
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora-34/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:34
 
 ENV LANG C
 # qt5-qtbase-devel skipped
diff --git a/docker/fedora-34/docker_build.sh b/docker/fedora-34/docker_build.sh
new file mode 100755
index 000000000..753d223a8
--- /dev/null
+++ b/docker/fedora-34/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-fedora-34:1.0" .
diff --git a/docker/fedora-34/docker_rm.sh b/docker/fedora-34/docker_rm.sh
new file mode 100644
index 000000000..eec1ba46c
--- /dev/null
+++ b/docker/fedora-34/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-fedora-34:1.0
+docker image rm fedora:34
diff --git a/docker/fedora/docker_run.sh b/docker/fedora-34/docker_run.sh
similarity index 87%
rename from docker/fedora/docker_run.sh
rename to docker/fedora-34/docker_run.sh
index 79718b831..6fbb2e6a9 100755
--- a/docker/fedora/docker_run.sh
+++ b/docker/fedora-34/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-fedora:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-fedora-34:1.0
diff --git a/docker/fedora/docker_build.sh b/docker/fedora/docker_build.sh
deleted file mode 100755
index e4ef2258a..000000000
--- a/docker/fedora/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-fedora:1.0" .
diff --git a/docker/fedora/docker_rm.sh b/docker/fedora/docker_rm.sh
deleted file mode 100644
index e2252b0dc..000000000
--- a/docker/fedora/docker_rm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-fedora:1.0
-docker image rm fedora:31
diff --git a/docker/opensuse-leap/Dockerfile b/docker/opensuse-leap/Dockerfile
new file mode 100644
index 000000000..cf860aeff
--- /dev/null
+++ b/docker/opensuse-leap/Dockerfile
@@ -0,0 +1,15 @@
+FROM opensuse/leap
+
+ENV LANG C
+# libqt5-qtbase-devel skipped
+RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis gcc-c++ readline-devel libbz2-devel cross-arm-none-gcc9 cross-arm-none-newlib-devel
+
+# Create rrg user
+RUN useradd -ms /bin/bash rrg
+RUN passwd -d rrg
+RUN printf 'rrg ALL=(ALL) NOPASSWD: ALL\n' | tee -a /etc/sudoers
+
+USER rrg
+WORKDIR "/home/rrg"
+
+CMD ["/bin/bash"]
diff --git a/docker/opensuse-leap/docker_build.sh b/docker/opensuse-leap/docker_build.sh
new file mode 100755
index 000000000..d7e8a8873
--- /dev/null
+++ b/docker/opensuse-leap/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-suse-leap:1.0" .
diff --git a/docker/opensuse-leap/docker_rm.sh b/docker/opensuse-leap/docker_rm.sh
new file mode 100644
index 000000000..9f120b8e1
--- /dev/null
+++ b/docker/opensuse-leap/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-suse-leap:1.0
+docker image rm opensuse/leap
diff --git a/docker/opensuse/docker_run.sh b/docker/opensuse-leap/docker_run.sh
similarity index 87%
rename from docker/opensuse/docker_run.sh
rename to docker/opensuse-leap/docker_run.sh
index 9b346bf69..66e7b7ce2 100755
--- a/docker/opensuse/docker_run.sh
+++ b/docker/opensuse-leap/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse-leap:1.0
diff --git a/docker/opensuse/Dockerfile b/docker/opensuse-tumbleweed/Dockerfile
similarity index 95%
rename from docker/opensuse/Dockerfile
rename to docker/opensuse-tumbleweed/Dockerfile
index 4fa4e93a8..1d347e479 100644
--- a/docker/opensuse/Dockerfile
+++ b/docker/opensuse-tumbleweed/Dockerfile
@@ -1,4 +1,3 @@
-#FROM opensuse/leap
 FROM opensuse/tumbleweed
 
 ENV LANG C
diff --git a/docker/opensuse-tumbleweed/docker_build.sh b/docker/opensuse-tumbleweed/docker_build.sh
new file mode 100755
index 000000000..b93549831
--- /dev/null
+++ b/docker/opensuse-tumbleweed/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-suse-tumbleweed:1.0" .
diff --git a/docker/opensuse-tumbleweed/docker_rm.sh b/docker/opensuse-tumbleweed/docker_rm.sh
new file mode 100644
index 000000000..f4d019f2b
--- /dev/null
+++ b/docker/opensuse-tumbleweed/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-suse-tumbleweed:1.0
+docker image rm opensuse/tumbleweed
diff --git a/docker/opensuse-tumbleweed/docker_run.sh b/docker/opensuse-tumbleweed/docker_run.sh
new file mode 100755
index 000000000..047afd9b7
--- /dev/null
+++ b/docker/opensuse-tumbleweed/docker_run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse-tumbleweed:1.0
diff --git a/docker/opensuse/docker_build.sh b/docker/opensuse/docker_build.sh
deleted file mode 100755
index e25149697..000000000
--- a/docker/opensuse/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-suse:1.0" .
diff --git a/docker/opensuse/docker_rm.sh b/docker/opensuse/docker_rm.sh
deleted file mode 100644
index 0d7ed3641..000000000
--- a/docker/opensuse/docker_rm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-suse:1.0
-docker image rm opensuse/tumbleweed opensuse/leap
diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu-18.04/Dockerfile
similarity index 100%
rename from docker/ubuntu18/Dockerfile
rename to docker/ubuntu-18.04/Dockerfile
diff --git a/docker/ubuntu-18.04/docker_build.sh b/docker/ubuntu-18.04/docker_build.sh
new file mode 100755
index 000000000..252b8792f
--- /dev/null
+++ b/docker/ubuntu-18.04/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu-18.04:1.0" .
diff --git a/docker/ubuntu18/docker_rm.sh b/docker/ubuntu-18.04/docker_rm.sh
similarity index 53%
rename from docker/ubuntu18/docker_rm.sh
rename to docker/ubuntu-18.04/docker_rm.sh
index 8f892ccea..c566f0e8d 100644
--- a/docker/ubuntu18/docker_rm.sh
+++ b/docker/ubuntu-18.04/docker_rm.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-ubuntu18:1.0
+docker image rm pm3-ubuntu-18.04:1.0
 docker image rm ubuntu:18.04
diff --git a/docker/ubuntu20/docker_run.sh b/docker/ubuntu-18.04/docker_run.sh
similarity index 84%
rename from docker/ubuntu20/docker_run.sh
rename to docker/ubuntu-18.04/docker_run.sh
index 524f3fb43..6827b69ac 100755
--- a/docker/ubuntu20/docker_run.sh
+++ b/docker/ubuntu-18.04/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu20:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu-18.04:1.0
diff --git a/docker/ubuntu20/Dockerfile b/docker/ubuntu-20.04/Dockerfile
similarity index 100%
rename from docker/ubuntu20/Dockerfile
rename to docker/ubuntu-20.04/Dockerfile
diff --git a/docker/ubuntu-20.04/docker_build.sh b/docker/ubuntu-20.04/docker_build.sh
new file mode 100755
index 000000000..58dfa2906
--- /dev/null
+++ b/docker/ubuntu-20.04/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu-20.04:1.0" .
diff --git a/docker/ubuntu20/docker_rm.sh b/docker/ubuntu-20.04/docker_rm.sh
similarity index 53%
rename from docker/ubuntu20/docker_rm.sh
rename to docker/ubuntu-20.04/docker_rm.sh
index cb4683c34..37b6fd8b2 100644
--- a/docker/ubuntu20/docker_rm.sh
+++ b/docker/ubuntu-20.04/docker_rm.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-ubuntu20:1.0
+docker image rm pm3-ubuntu-20.04:1.0
 docker image rm ubuntu:20.04
diff --git a/docker/ubuntu18/docker_run.sh b/docker/ubuntu-20.04/docker_run.sh
similarity index 84%
rename from docker/ubuntu18/docker_run.sh
rename to docker/ubuntu-20.04/docker_run.sh
index 7c41babc0..bb68ba6f8 100755
--- a/docker/ubuntu18/docker_run.sh
+++ b/docker/ubuntu-20.04/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu18:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu-20.04:1.0
diff --git a/docker/ubuntu18/docker_build.sh b/docker/ubuntu18/docker_build.sh
deleted file mode 100755
index 03ee43fd4..000000000
--- a/docker/ubuntu18/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-ubuntu18:1.0" .
diff --git a/docker/ubuntu20/docker_build.sh b/docker/ubuntu20/docker_build.sh
deleted file mode 100755
index 21f28b4fe..000000000
--- a/docker/ubuntu20/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-ubuntu20:1.0" .