diff --git a/.github/workflows/build_fw.yml b/.github/workflows/build_fw.yml
index bdc2d543d69..69e67ced792 100644
--- a/.github/workflows/build_fw.yml
+++ b/.github/workflows/build_fw.yml
@@ -49,7 +49,7 @@ jobs:
           - h17 # Senduwing
           - t18h7 # Jumper
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
@@ -97,7 +97,7 @@ jobs:
           - h17 # Senduwing
           - t18h7 # Jumper
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
diff --git a/.github/workflows/codegen_drift.yml b/.github/workflows/codegen_drift.yml
index 1efd3e51897..22d071e984c 100644
--- a/.github/workflows/codegen_drift.yml
+++ b/.github/workflows/codegen_drift.yml
@@ -141,7 +141,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
@@ -164,7 +164,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
@@ -187,7 +187,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
@@ -210,7 +210,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps:
diff --git a/.github/workflows/companion.yml b/.github/workflows/companion.yml
index ee3b9bd9a37..eea0eec2979 100644
--- a/.github/workflows/companion.yml
+++ b/.github/workflows/companion.yml
@@ -107,7 +107,7 @@ jobs:
       (github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'ci: skip-cpn-linux'))
 
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c7e97bff1cb..446089858c1 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,7 +26,7 @@ jobs:
           - boxer;gx12;gx15;mt12;pocket;tx12mk2;tx15;tx16s;tx16smk3;zorro # RadioMaster
           - h17 # Senduwing
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:pr-42
       volumes:
         - ${{ github.workspace }}:/src
     steps: