diff --git a/docker/build-all.sh b/docker/build-all.sh
index 3116d96dc..aba45382f 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 kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-18.04 ubuntu-20.04 ubuntu-21.04; do
+for os in archlinux debian-buster fedora-36 fedora-37 homebrew kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-18.04 ubuntu-20.04 ubuntu-22.04; do
   (  cd $os && ./docker_build.sh )
 done
diff --git a/docker/fedora-36/run_tests.sh b/docker/fedora-36/run_tests.sh
index f4f632503..05cdb7da8 100755
--- a/docker/fedora-36/run_tests.sh
+++ b/docker/fedora-36/run_tests.sh
@@ -4,5 +4,5 @@
 # This script is to be run from proxmark root folder inside the docker env
 # docker/fedora-36/run_tests.sh;
 
-sudo apt update && sudo apt upgrade -y
+sudo yum -y update
 tools/release_tests.sh
diff --git a/docker/fedora-37/run_tests.sh b/docker/fedora-37/run_tests.sh
index f4f632503..05cdb7da8 100755
--- a/docker/fedora-37/run_tests.sh
+++ b/docker/fedora-37/run_tests.sh
@@ -4,5 +4,5 @@
 # This script is to be run from proxmark root folder inside the docker env
 # docker/fedora-36/run_tests.sh;
 
-sudo apt update && sudo apt upgrade -y
+sudo yum -y update
 tools/release_tests.sh
diff --git a/docker/opensuse-leap/Dockerfile b/docker/opensuse-leap/Dockerfile
index c8a5c7cf1..1af777d23 100644
--- a/docker/opensuse-leap/Dockerfile
+++ b/docker/opensuse-leap/Dockerfile
@@ -4,8 +4,14 @@ 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 bluez-devel python3-devel libopenssl-devel
 
-RUN zypper --non-interactive install cmake python3 python3-pip
-RUN python3 -m pip install ansicolors sslcrypto
+RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/15.4/home:wkazubski.repo && \
+    zypper --gpg-auto-import-keys refresh && \
+    zypper --non-interactive install cross-arm-none-eabi-gcc12 cross-arm-none-eabi-newlib
+
+RUN zypper --non-interactive install cmake python3 python3-pip && \
+    python3 -m pip install ansicolors sslcrypto
+
+RUN zypper --non-interactive install ocl-icd-devel
 
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
diff --git a/docker/opensuse-leap/README.md b/docker/opensuse-leap/README.md
index 47a3b5c32..ecda34706 100644
--- a/docker/opensuse-leap/README.md
+++ b/docker/opensuse-leap/README.md
@@ -1,24 +1,20 @@
 # Notes on run_tests.sh script
-This script does both setup 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.
+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/opensuse-leap/run_tests.sh;
-``` 
+```
 
-Or if you want to run single test,  
+Or if you want to run single test,
 
 ```
+sudo zypper refresh && sudo zypper --non-interactive update
 make clean; make -j
-tools/pm3_tests.sh --long mfkey nonce2key mf_nonce_brute fpga_compress common client
+tools/pm3_tests.sh --long
 ```
-
-
-No ARM compiler available ?
diff --git a/docker/opensuse-leap/run_tests.sh b/docker/opensuse-leap/run_tests.sh
new file mode 100755
index 000000000..d2d49211b
--- /dev/null
+++ b/docker/opensuse-leap/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/opensuse-leap/run_tests.sh;
+
+sudo zypper refresh && sudo zypper --non-interactive update
+tools/release_tests.sh
diff --git a/docker/opensuse-tumbleweed/Dockerfile b/docker/opensuse-tumbleweed/Dockerfile
index 5d4adbb8b..169d087c3 100644
--- a/docker/opensuse-tumbleweed/Dockerfile
+++ b/docker/opensuse-tumbleweed/Dockerfile
@@ -2,10 +2,16 @@ FROM opensuse/tumbleweed
 
 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 bluez-devel python3-devel libopenssl-devel cross-arm-none-gcc11 cross-arm-none-newlib-devel
+RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis gcc-c++ readline-devel libbz2-devel bluez-devel python3-devel libopenssl-devel cross-arm-none-gcc12 cross-arm-none-newlib-devel
 
-RUN zypper --non-interactive install cmake python3 python3-pip
-RUN python3 -m pip install ansicolors sslcrypto
+#RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/openSUSE_Tumbleweed/home:wkazubski.repo && \
+#    zypper --gpg-auto-import-keys refresh && \
+#    zypper --non-interactive install cross-arm-none-eabi-gcc12 cross-arm-none-eabi-newlib
+
+RUN zypper --non-interactive install cmake python3 python3-pip && \
+    python3 -m pip install ansicolors sslcrypto
+
+RUN zypper --non-interactive install ocl-icd-devel
 
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
diff --git a/docker/opensuse-tumbleweed/README.md b/docker/opensuse-tumbleweed/README.md
index 126042512..bd55e0c9d 100644
--- a/docker/opensuse-tumbleweed/README.md
+++ b/docker/opensuse-tumbleweed/README.md
@@ -1,24 +1,20 @@
 # Notes on run_tests.sh script
-This script does both setup 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.
+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/opensuse-tumbleweed/run_tests.sh;
-``` 
+```
 
-Or if you want to run single test,  
+Or if you want to run single test,
 
 ```
+sudo zypper refresh && sudo zypper --non-interactive update
 make clean; make -j
-tools/pm3_tests.sh --long mfkey nonce2key mf_nonce_brute fpga_compress common client
+tools/pm3_tests.sh --long
 ```
-
-
-No ARM compiler available ?
diff --git a/docker/opensuse-tumbleweed/run_tests.sh b/docker/opensuse-tumbleweed/run_tests.sh
new file mode 100755
index 000000000..9002131e9
--- /dev/null
+++ b/docker/opensuse-tumbleweed/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/opensuse-tumbleweed/run_tests.sh;
+
+sudo zypper refresh && sudo zypper --non-interactive update
+tools/release_tests.sh