diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index f75d8e8466..a425306d6e 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -6,13 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - frawhide
+      - f41
   pull_request:
     branches:
-      - frawhide
+      - f41
   merge_group:
     branches:
-      - frawhide
+      - f41
   workflow_dispatch:
   workflow_call:
 
@@ -23,7 +23,7 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f41
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["41"]
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index e78df7b691..df254d07e8 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -7,7 +7,7 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["rawhide"]
+        version: ["41"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c922f12e82..0be66602c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["41"]
         arch: ${{ fromJson(needs.parse.outputs.arch) }}
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index 3683b3d76a..31f92988ce 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["41"]
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
index 40c20d9c2a..d889f19f38 100644
--- a/.github/workflows/update-comps.yml
+++ b/.github/workflows/update-comps.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - frawhide
+      - f41
       - f40
-      - f39
     paths:
       - comps.xml
   workflow_dispatch: