diff --git a/.github/ISSUE_TEMPLATE/checklist-for-release.md b/.github/ISSUE_TEMPLATE/checklist-for-release.md
index 5deb64538..a30b2fb22 100644
--- a/.github/ISSUE_TEMPLATE/checklist-for-release.md
+++ b/.github/ISSUE_TEMPLATE/checklist-for-release.md
@@ -32,7 +32,7 @@ Run `tools/release_tests.sh` on:
 - [ ] Kali
 - [ ] Debian Stable
 - [ ] Debian Testing
-- [ ] Ubuntu21
+- [ ] Ubuntu 22
 - [ ] ParrotOS
 - [ ] Fedora
 - [ ] OpenSuse Leap
diff --git a/docker/ubuntu-18.04/Dockerfile b/docker/ubuntu-18.04/Dockerfile
index 11c5afcd8..29c958a4d 100644
--- a/docker/ubuntu-18.04/Dockerfile
+++ b/docker/ubuntu-18.04/Dockerfile
@@ -10,10 +10,14 @@ RUN apt-get update && \
     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 libssl-dev sudo && \
     apt-get clean
 
-RUN apt install -y python3-minimal && \
-    apt install -y python3-pip && \
+RUN apt-get install -y python3-minimal && \
+    apt-get install -y python3-pip && \
+    apt-get clean && \
     python3 -m pip install ansicolors sslcrypto
 
+RUN apt-get install -y opencl-dev && \
+    apt-get clean
+
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
diff --git a/docker/ubuntu-18.04/README.md b/docker/ubuntu-18.04/README.md
index 0b7d2f748..6cc3b9ef2 100644
--- a/docker/ubuntu-18.04/README.md
+++ b/docker/ubuntu-18.04/README.md
@@ -1,9 +1,8 @@
 # Notes on run_tests.sh script
-This script does both setup the mirrors and pip install and then run a 
-bunch of different builds with make and cmake together with the different combos 
-of RDV4, GENERIC, BTADDON combos. 
+This script runs a bunch of different builds with make and cmake together
+with the different combos of RDV4, GENERIC, BTADDON combos.
 
-If all tests OK,  the script will finish.
+If all tests OK,  the script will finish with PASS.
 
 
 # Notes to run tests
diff --git a/docker/ubuntu-18.04/run_tests.sh b/docker/ubuntu-18.04/run_tests.sh
new file mode 100755
index 000000000..25e6d2a21
--- /dev/null
+++ b/docker/ubuntu-18.04/run_tests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Iceman 2022
+#
+# This script is to be run from proxmark root folder inside the docker env
+# docker/debian-bullseye/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+tools/release_tests.sh
diff --git a/docker/ubuntu-20.04/Dockerfile b/docker/ubuntu-20.04/Dockerfile
index d9138aa0d..72f6ec6cf 100644
--- a/docker/ubuntu-20.04/Dockerfile
+++ b/docker/ubuntu-20.04/Dockerfile
@@ -9,10 +9,14 @@ RUN apt-get update && \
     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 libssl-dev sudo && \
     apt-get clean
 
-RUN apt install -y python3-minimal && \
-    apt install -y python3-pip && \
+RUN apt-get install -y python3-minimal && \
+    apt-get install -y python3-pip && \
+    apt-get clean && \
     python3 -m pip install ansicolors sslcrypto
 
+RUN apt-get install -y opencl-dev && \
+    apt-get clean
+
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
diff --git a/docker/ubuntu-20.04/README.md b/docker/ubuntu-20.04/README.md
index d8c7b3f53..4c432eff1 100644
--- a/docker/ubuntu-20.04/README.md
+++ b/docker/ubuntu-20.04/README.md
@@ -1,9 +1,8 @@
 # Notes on run_tests.sh script
-This script does both setup the mirrors and pip install and then run a 
-bunch of different builds with make and cmake together with the different combos 
-of RDV4, GENERIC, BTADDON combos. 
+This script runs a bunch of different builds with make and cmake together
+with the different combos of RDV4, GENERIC, BTADDON combos.
 
-If all tests OK,  the script will finish.
+If all tests OK,  the script will finish with PASS.
 
 
 # Notes to run tests
diff --git a/docker/ubuntu-20.04/run_tests.sh b/docker/ubuntu-20.04/run_tests.sh
new file mode 100755
index 000000000..25e6d2a21
--- /dev/null
+++ b/docker/ubuntu-20.04/run_tests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Iceman 2022
+#
+# This script is to be run from proxmark root folder inside the docker env
+# docker/debian-bullseye/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+tools/release_tests.sh
diff --git a/docker/ubuntu-21.04/README.md b/docker/ubuntu-21.04/README.md
deleted file mode 100644
index bb90abab8..000000000
--- a/docker/ubuntu-21.04/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Notes on run_tests.sh script
-This script does both setup the mirrors and pip install and then run a 
-bunch of different builds with make and cmake together with the different combos 
-of RDV4, GENERIC, BTADDON combos. 
-
-If all tests OK,  the script will finish.
-
-
-# Notes to run tests
-The script is to be run in proxmark root folder inside the docker env.
-
-```
-docker/ubuntu-21.04/run_tests.sh;
-``` 
-
-Or if you want to run single test,  
-```
-sudo apt update
-make clean; make -j
-tools/pm3_tests.sh --long
-```
diff --git a/docker/ubuntu-21.04/docker_build.sh b/docker/ubuntu-21.04/docker_build.sh
deleted file mode 100755
index 70e0349f8..000000000
--- a/docker/ubuntu-21.04/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
deleted file mode 100644
index bb848bfe0..000000000
--- a/docker/ubuntu-21.04/docker_rm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-ubuntu-21.04:1.0
-docker image rm ubuntu:21.04
diff --git a/docker/ubuntu-21.04/Dockerfile b/docker/ubuntu-22.04/Dockerfile
similarity index 76%
rename from docker/ubuntu-21.04/Dockerfile
rename to docker/ubuntu-22.04/Dockerfile
index 4350e8aa3..9d867e785 100644
--- a/docker/ubuntu-21.04/Dockerfile
+++ b/docker/ubuntu-22.04/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:22.04
 
 ENV LANG C
 ENV DEBIAN_FRONTEND noninteractive
@@ -9,10 +9,14 @@ RUN apt-get update && \
     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 libssl-dev sudo && \
     apt-get clean
 
-RUN apt install -y python3-minimal && \
-    apt install -y python3-pip && \
+RUN apt-get install -y python3-minimal && \
+    apt-get install -y python3-pip && \
+    apt-get clean && \
     python3 -m pip install ansicolors sslcrypto
 
+RUN apt-get install -y opencl-dev && \
+    apt-get clean
+
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
diff --git a/docker/ubuntu-22.04/README.md b/docker/ubuntu-22.04/README.md
new file mode 100644
index 000000000..93d4462ad
--- /dev/null
+++ b/docker/ubuntu-22.04/README.md
@@ -0,0 +1,20 @@
+# Notes on run_tests.sh script
+This script runs a bunch of different builds with make and cmake together
+with the different combos of RDV4, GENERIC, BTADDON combos.
+
+If all tests OK,  the script will finish with PASS.
+
+
+# Notes to run tests
+The script is to be run in proxmark root folder inside the docker env.
+
+```
+docker/ubuntu-22.04/run_tests.sh;
+``` 
+
+Or if you want to run single test,  
+```
+sudo apt update
+make clean; make -j
+tools/pm3_tests.sh --long
+```
diff --git a/docker/ubuntu-22.04/docker_build.sh b/docker/ubuntu-22.04/docker_build.sh
new file mode 100755
index 000000000..1cfd6c10a
--- /dev/null
+++ b/docker/ubuntu-22.04/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu-22.04:1.0" .
diff --git a/docker/ubuntu-22.04/docker_rm.sh b/docker/ubuntu-22.04/docker_rm.sh
new file mode 100644
index 000000000..e6a5f0302
--- /dev/null
+++ b/docker/ubuntu-22.04/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-ubuntu-22.04:1.0
+docker image rm ubuntu:22.04
diff --git a/docker/ubuntu-21.04/docker_run.sh b/docker/ubuntu-22.04/docker_run.sh
similarity index 67%
rename from docker/ubuntu-21.04/docker_run.sh
rename to docker/ubuntu-22.04/docker_run.sh
index d8fd6722f..04f8d99a0 100755
--- a/docker/ubuntu-21.04/docker_run.sh
+++ b/docker/ubuntu-22.04/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-ubuntu-21.04:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-ubuntu-22.04:1.0
diff --git a/docker/ubuntu-22.04/run_tests.sh b/docker/ubuntu-22.04/run_tests.sh
new file mode 100755
index 000000000..25e6d2a21
--- /dev/null
+++ b/docker/ubuntu-22.04/run_tests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Iceman 2022
+#
+# This script is to be run from proxmark root folder inside the docker env
+# docker/debian-bullseye/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+tools/release_tests.sh