diff --git a/.github/ISSUE_TEMPLATE/checklist-for-release.md b/.github/ISSUE_TEMPLATE/checklist-for-release.md
index a30b2fb22..8b5872891 100644
--- a/.github/ISSUE_TEMPLATE/checklist-for-release.md
+++ b/.github/ISSUE_TEMPLATE/checklist-for-release.md
@@ -34,7 +34,7 @@ Run `tools/release_tests.sh` on:
 - [ ] Debian Testing
 - [ ] Ubuntu 22
 - [ ] ParrotOS
-- [ ] Fedora
+- [ ] Fedora 37
 - [ ] OpenSuse Leap
 - [ ] OpenSuse Tumbleweed
 - [ ] OSX (MacPorts)
diff --git a/docker/fedora-34/README.md b/docker/fedora-34/README.md
deleted file mode 100644
index 7930f99d0..000000000
--- a/docker/fedora-34/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Notes on run_tests.sh script
-This script does both strip the "recover_pk test" in pm3_tests.sh 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/fedora-34/run_tests.sh;
-``` 
-
-Or if you want to run single test,  
-
-```
-sudo yum -y update
-make clean; make -j
-tools/pm3_tests.sh --long
-```
-
-Warning, `recover_pk selftests` will fail on Fedora because they stripped down the available ECC curves in their OpenSSL.
-
-So just comment the "recover_pk test"
\ No newline at end of file
diff --git a/docker/fedora-34/docker_build.sh b/docker/fedora-34/docker_build.sh
deleted file mode 100755
index 753d223a8..000000000
--- a/docker/fedora-34/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
deleted file mode 100644
index eec1ba46c..000000000
--- a/docker/fedora-34/docker_rm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-fedora-34:1.0
-docker image rm fedora:34
diff --git a/docker/fedora-35/README.md b/docker/fedora-35/README.md
deleted file mode 100644
index 966e86e7e..000000000
--- a/docker/fedora-35/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Notes on run_tests.sh script
-This script does both strip the "recover_pk test" in pm3_tests.sh 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/fedora-35/run_tests.sh;
-``` 
-
-Or if you want to run single test,  
-
-```
-sudo yum -y update
-make clean; make -j
-tools/pm3_tests.sh --long
-```
-
-Warning, `recover_pk selftests` will fail on Fedora because they stripped down the available ECC curves in their OpenSSL.
-
-So just comment the "recover_pk test"
diff --git a/docker/fedora-35/docker_build.sh b/docker/fedora-35/docker_build.sh
deleted file mode 100755
index 57eca95c0..000000000
--- a/docker/fedora-35/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-fedora-35:1.0" .
diff --git a/docker/fedora-35/docker_rm.sh b/docker/fedora-35/docker_rm.sh
deleted file mode 100644
index 100bd2690..000000000
--- a/docker/fedora-35/docker_rm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-fedora-35:1.0
-docker image rm fedora:35
diff --git a/docker/fedora-34/Dockerfile b/docker/fedora-36/Dockerfile
similarity index 88%
rename from docker/fedora-34/Dockerfile
rename to docker/fedora-36/Dockerfile
index 90765a515..007af68c3 100644
--- a/docker/fedora-34/Dockerfile
+++ b/docker/fedora-36/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:36
 
 ENV LANG C
 # qt5-qtbase-devel skipped
@@ -8,6 +8,8 @@ RUN yum -y update
 RUN yum -y install cmake python-pip
 RUN python3 -m pip install ansicolors sslcrypto
 
+RUN yum -y install mesa-libOpenCL ocl-icd-devel
+
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
diff --git a/docker/fedora-36/README.md b/docker/fedora-36/README.md
new file mode 100644
index 000000000..6648fb28d
--- /dev/null
+++ b/docker/fedora-36/README.md
@@ -0,0 +1,21 @@
+# 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/fedora-36/run_tests.sh;
+```
+
+Or if you want to run single test,
+
+```
+sudo yum -y update
+make clean; make -j
+tools/pm3_tests.sh --long
+```
diff --git a/docker/fedora-36/docker_build.sh b/docker/fedora-36/docker_build.sh
new file mode 100755
index 000000000..1a2e2d392
--- /dev/null
+++ b/docker/fedora-36/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-fedora-36:1.0" .
diff --git a/docker/fedora-36/docker_rm.sh b/docker/fedora-36/docker_rm.sh
new file mode 100644
index 000000000..ea2b28809
--- /dev/null
+++ b/docker/fedora-36/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-fedora-36:1.0
+docker image rm fedora:36
diff --git a/docker/fedora-34/docker_run.sh b/docker/fedora-36/docker_run.sh
similarity index 69%
rename from docker/fedora-34/docker_run.sh
rename to docker/fedora-36/docker_run.sh
index 4be59d2c5..0e6e69925 100755
--- a/docker/fedora-34/docker_run.sh
+++ b/docker/fedora-36/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-fedora-34:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-fedora-36:1.0
diff --git a/docker/fedora-36/run_tests.sh b/docker/fedora-36/run_tests.sh
new file mode 100755
index 000000000..f4f632503
--- /dev/null
+++ b/docker/fedora-36/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/fedora-36/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+tools/release_tests.sh
diff --git a/docker/fedora-35/Dockerfile b/docker/fedora-37/Dockerfile
similarity index 88%
rename from docker/fedora-35/Dockerfile
rename to docker/fedora-37/Dockerfile
index 40788b62a..930767853 100644
--- a/docker/fedora-35/Dockerfile
+++ b/docker/fedora-37/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:35
+FROM fedora:37
 
 ENV LANG C
 # qt5-qtbase-devel skipped
@@ -8,6 +8,8 @@ RUN yum -y update
 RUN yum -y install cmake python-pip
 RUN python3 -m pip install ansicolors sslcrypto
 
+RUN yum -y install mesa-libOpenCL ocl-icd-devel
+
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
diff --git a/docker/fedora-37/README.md b/docker/fedora-37/README.md
new file mode 100644
index 000000000..79c88e040
--- /dev/null
+++ b/docker/fedora-37/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/fedora-37/run_tests.sh;
+``` 
+
+Or if you want to run single test,  
+
+```
+sudo yum -y update
+make clean; make -j
+tools/pm3_tests.sh --long
+```
diff --git a/docker/fedora-37/docker_build.sh b/docker/fedora-37/docker_build.sh
new file mode 100755
index 000000000..5e3049b68
--- /dev/null
+++ b/docker/fedora-37/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-fedora-37:1.0" .
diff --git a/docker/fedora-37/docker_rm.sh b/docker/fedora-37/docker_rm.sh
new file mode 100644
index 000000000..a9359d0fd
--- /dev/null
+++ b/docker/fedora-37/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-fedora-37:1.0
+docker image rm fedora:37
diff --git a/docker/fedora-35/docker_run.sh b/docker/fedora-37/docker_run.sh
similarity index 69%
rename from docker/fedora-35/docker_run.sh
rename to docker/fedora-37/docker_run.sh
index d2e027507..eb51525b7 100755
--- a/docker/fedora-35/docker_run.sh
+++ b/docker/fedora-37/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-fedora-35:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-fedora-37:1.0
diff --git a/docker/fedora-37/run_tests.sh b/docker/fedora-37/run_tests.sh
new file mode 100755
index 000000000..f4f632503
--- /dev/null
+++ b/docker/fedora-37/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/fedora-36/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+tools/release_tests.sh