diff --git a/.github/workflows/update-driver-submodules.yml b/.github/workflows/update-driver-submodules.yml
index 2c4d24c..400be5f 100644
--- a/.github/workflows/update-driver-submodules.yml
+++ b/.github/workflows/update-driver-submodules.yml
@@ -18,6 +18,17 @@ jobs:
           submodules: true
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
+          persist-credentials: true
+
+      - name: Install rpm
+        run: |
+          sudo apt-get install -y rpm
+
+      - name: Configure git credentials for xcp-ng/driver-sources
+        env:
+          XCP_NG_RPMS_PAT: ${{ secrets.XCP_NG_RPMS_PAT }}
+        run: |
+          git config --global url."https://x-access-token:${XCP_NG_RPMS_PAT}@github.com/xcp-ng/driver-sources".insteadOf "git@github.com:xcp-ng/driver-sources"
 
       - name: Update driver submodules to origin/8.3
         id: update
@@ -45,25 +56,18 @@ jobs:
               # Missing sources, we need to add the sub-module as well as import its sources
               {
                 # Add the source sub-module
-                git submodule add git@github.com/xcpng-rpms/$(basename "$submodule").git "drivers/8.3/source/$(basename "submodule")"
+                git submodule add -b source/8.3 git@github.com:xcp-ng/driver-sources.git "drivers/8.3/source/$(basename "submodule")"
 
                 # Import the sources
                 cd "$submodule"
-                #   git-import-srpm needs a source/8.3 branch to import the sources as base onto point
-                cur_rev=$(git rev-parse HEAD)
-                git checkout --orphan source/8.3
-                git rm -rf
-                git commit --allow-empty -m "Initial commit."
-                git push origin source/8.3
-                git checkout ${cur_rev}
-                #   actually do the import now
+
                 branch=$(OOT_DRIVER_IMPORT=y ../../../../scripts/git-import-srpm HEAD | sed -n 's/.*Constructing \([^ ]\+\) from rev HEAD/\1/p')
                 cd -
 
                 # Push the source branch and update source sub-module
                 cd "$src_submodule"
                 git checkout $branch^0
-                git push origin $branch
+                git push origin $branch ${branch%patched}source
                 missing_sources+=("$src_submodule")
 
                 cd -
@@ -81,6 +85,8 @@ jobs:
                 if [ "$(git rev-parse HEAD)" != "$(git rev-parse $branch)" ]; then
                   # Sources are stale, refresh them from the above import
                   git checkout $branch^0
+                  # And push them
+                  git push -f origin ${branch} ${branch%patched}source
                   updated_sources+=("$src_submodule")
                 fi
                 cd -
@@ -91,7 +97,7 @@ jobs:
           if [ ${#updated[@]} -gt 0 -o ${#missing_sources[@]} -gt 0 -o ${#updated_sources[@]} -gt 0 ]; then
             echo "updated=true" >> "$GITHUB_OUTPUT"
             printf '%s\n' "${updated[@]}" > /tmp/updated-submodules.txt
-            printf '%s\n' "${missing_sources[@]}" > /tmp/missing_sources.txt
+            printf '%s\n' "${missing_sources[@]}" > /tmp/missing-sources.txt
             printf '%s\n' "${updated_sources[@]}" > /tmp/updated-sources.txt
           else
             echo "No submodules needed updating."
@@ -101,8 +107,7 @@ jobs:
       - name: Regenerate drivers/README.md
         if: steps.update.outputs.updated == 'true'
         run: |
-          sudo apt-get install -y rpm
-          scripts/update-drivers-list.sh
+          ./scripts/update-drivers-list.sh
 
       - name: Commit and open PR
         if: steps.update.outputs.updated == 'true'
@@ -115,8 +120,8 @@ jobs:
           git config user.email "gitimporter@vates.tech"
 
           git checkout -b "$branch"
-          git add drivers/8.3
-          git commit -m "drivers: update submodules and corresponding sources to latest 8.3 branch"
+          git add -u
+          git commit -s -m "drivers: update submodules and corresponding sources to latest 8.3 branch"
 
           # Force-push so a re-run on the same day updates the existing branch.
           git push --force origin "$branch"
@@ -126,12 +131,21 @@ jobs:
             {
               echo "Automated daily update of driver submodules to the latest \`8.3\` branch."
               echo ""
-              echo "Updated submodules:"
-              sed 's/^/- /' /tmp/updated-submodules.txt
-              echo "Added source submodules:"
-              sed 's/^/- /' /tmp/missing-sources.txt
-              echo "Updated source submodules:"
-              sed 's/^/- /' /tmp/updated-sources.txt
+              test -f /tmp/updated-submodules.txt && {
+                echo "Updated submodules:"
+                sed 's/^/- /' /tmp/updated-submodules.txt
+                echo ""
+              }
+              test -f /tmp/missing-sources.txt && {
+                echo "Added source submodules:"
+                sed 's/^/- /' /tmp/missing-sources.txt
+                echo ""
+              }
+              test -f /tmp/updated-sources.txt && {
+                echo "Updated source submodules:"
+                sed 's/^/- /' /tmp/updated-sources.txt
+                echo ""
+              }
             } > /tmp/pr-body.txt
 
             gh pr create \
diff --git a/.gitmodules b/.gitmodules
index 15f379a..d6ff11d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -72,76 +72,76 @@
 	url = git@github.com:xcp-ng-rpms/r8125-module.git
 [submodule "drivers/8.3/source/aqc111u-module"]
 	path = drivers/8.3/source/aqc111u-module
-	url = git@github.com:xcp-ng-rpms/aqc111u-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/avago-megaraid-sas"]
 	path = drivers/8.3/source/avago-megaraid-sas
-	url = git@github.com:xcp-ng-rpms/avago-megaraid-sas.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/avago-mpt3sas"]
 	path = drivers/8.3/source/avago-mpt3sas
-	url = git@github.com:xcp-ng-rpms/avago-mpt3sas.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/broadcom-bnxt-en"]
 	path = drivers/8.3/source/broadcom-bnxt-en
-	url = git@github.com:xcp-ng-rpms/broadcom-bnxt-en.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/chelsio-cxgb4"]
 	path = drivers/8.3/source/chelsio-cxgb4
-	url = git@github.com:xcp-ng-rpms/chelsio-cxgb4.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-enic"]
 	path = drivers/8.3/source/cisco-enic
-	url = git@github.com:xcp-ng-rpms/cisco-enic.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-fnic"]
 	path = drivers/8.3/source/cisco-fnic
-	url = git@github.com:xcp-ng-rpms/cisco-fnic.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/dell-rbu-module"]
 	path = drivers/8.3/source/dell-rbu-module
-	url = git@github.com:xcp-ng-rpms/dell-rbu-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/emulex-lpfc"]
 	path = drivers/8.3/source/emulex-lpfc
-	url = git@github.com:xcp-ng-rpms/emulex-lpfc.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-e1000e"]
 	path = drivers/8.3/source/intel-e1000e
-	url = git@github.com:xcp-ng-rpms/intel-e1000e.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-fm10k"]
 	path = drivers/8.3/source/intel-fm10k
-	url = git@github.com:xcp-ng-rpms/intel-fm10k.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-i40e"]
 	path = drivers/8.3/source/intel-i40e
-	url = git@github.com:xcp-ng-rpms/intel-i40e.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ice"]
 	path = drivers/8.3/source/intel-ice
-	url = git@github.com:xcp-ng-rpms/intel-ice.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-igb"]
 	path = drivers/8.3/source/intel-igb
-	url = git@github.com:xcp-ng-rpms/intel-igb.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-igc"]
 	path = drivers/8.3/source/intel-igc
-	url = git@github.com:xcp-ng-rpms/intel-igc.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ixgbe"]
 	path = drivers/8.3/source/intel-ixgbe
-	url = git@github.com:xcp-ng-rpms/intel-ixgbe.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mellanox-mlnxen"]
 	path = drivers/8.3/source/mellanox-mlnxen
-	url = git@github.com:xcp-ng-rpms/mellanox-mlnxen.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/microsemi-aacraid"]
 	path = drivers/8.3/source/microsemi-aacraid
-	url = git@github.com:xcp-ng-rpms/microsemi-aacraid.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/microsemi-smartpqi"]
 	path = drivers/8.3/source/microsemi-smartpqi
-	url = git@github.com:xcp-ng-rpms/microsemi-smartpqi.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mpi3mr-module"]
 	path = drivers/8.3/source/mpi3mr-module
-	url = git@github.com:xcp-ng-rpms/mpi3mr-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-fastlinq"]
 	path = drivers/8.3/source/qlogic-fastlinq
-	url = git@github.com:xcp-ng-rpms/qlogic-fastlinq.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-netxtreme2"]
 	path = drivers/8.3/source/qlogic-netxtreme2
-	url = git@github.com:xcp-ng-rpms/qlogic-netxtreme2.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-qla2xxx"]
 	path = drivers/8.3/source/qlogic-qla2xxx
-	url = git@github.com:xcp-ng-rpms/qlogic-qla2xxx.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/r8125-module"]
 	path = drivers/8.3/source/r8125-module
-	url = git@github.com:xcp-ng-rpms/r8125-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/sfc-module-alt"]
 	path = drivers/8.3/srpm/sfc-module-alt
 	url = git@github.com:xcp-ng-rpms/sfc-module-alt.git
@@ -204,64 +204,64 @@
 	url = git@github.com:xcp-ng-rpms/microsemi-smartpqi-alt.git
 [submodule "drivers/8.3/source/atlantic-module-alt"]
 	path = drivers/8.3/source/atlantic-module-alt
-	url = git@github.com:xcp-ng-rpms/atlantic-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/broadcom-bnxt-en-alt"]
 	path = drivers/8.3/source/broadcom-bnxt-en-alt
-	url = git@github.com:xcp-ng-rpms/broadcom-bnxt-en-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-enic-alt"]
 	path = drivers/8.3/source/cisco-enic-alt
-	url = git@github.com:xcp-ng-rpms/cisco-enic-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-fnic-alt"]
 	path = drivers/8.3/source/cisco-fnic-alt
-	url = git@github.com:xcp-ng-rpms/cisco-fnic-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/coretemp-module-alt"]
 	path = drivers/8.3/source/coretemp-module-alt
-	url = git@github.com:xcp-ng-rpms/coretemp-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/emulex-lpfc-alt"]
 	path = drivers/8.3/source/emulex-lpfc-alt
-	url = git@github.com:xcp-ng-rpms/emulex-lpfc-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-e1000e-alt"]
 	path = drivers/8.3/source/intel-e1000e-alt
-	url = git@github.com:xcp-ng-rpms/intel-e1000e-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-i40e-alt"]
 	path = drivers/8.3/source/intel-i40e-alt
-	url = git@github.com:xcp-ng-rpms/intel-i40e-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ice-alt"]
 	path = drivers/8.3/source/intel-ice-alt
-	url = git@github.com:xcp-ng-rpms/intel-ice-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-igb-alt"]
 	path = drivers/8.3/source/intel-igb-alt
-	url = git@github.com:xcp-ng-rpms/intel-igb-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ixgbe-alt"]
 	path = drivers/8.3/source/intel-ixgbe-alt
-	url = git@github.com:xcp-ng-rpms/intel-ixgbe-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mellanox-mlnxen-alt"]
 	path = drivers/8.3/source/mellanox-mlnxen-alt
-	url = git@github.com:xcp-ng-rpms/mellanox-mlnxen-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/microsemi-smartpqi-alt"]
 	path = drivers/8.3/source/microsemi-smartpqi-alt
-	url = git@github.com:xcp-ng-rpms/microsemi-smartpqi-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mlx4-modules-alt"]
 	path = drivers/8.3/source/mlx4-modules-alt
-	url = git@github.com:xcp-ng-rpms/mlx4-modules-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-fastlinq-alt"]
 	path = drivers/8.3/source/qlogic-fastlinq-alt
-	url = git@github.com:xcp-ng-rpms/qlogic-fastlinq-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-netxtreme2-alt"]
 	path = drivers/8.3/source/qlogic-netxtreme2-alt
-	url = git@github.com:xcp-ng-rpms/qlogic-netxtreme2-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-qla2xxx-alt"]
 	path = drivers/8.3/source/qlogic-qla2xxx-alt
-	url = git@github.com:xcp-ng-rpms/qlogic-qla2xxx-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/r8169-module-alt"]
 	path = drivers/8.3/source/r8169-module-alt
-	url = git@github.com:xcp-ng-rpms/r8169-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/sfc-module-alt"]
 	path = drivers/8.3/source/sfc-module-alt
-	url = git@github.com:xcp-ng-rpms/sfc-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/tg3-module-alt"]
 	path = drivers/8.3/source/tg3-module-alt
-	url = git@github.com:xcp-ng-rpms/tg3-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "driver-disks"]
 	path = driver-disks
 	url = git@github.com:xcp-ng/driver-disks.git
diff --git a/drivers/8.3/source/atlantic-module-alt b/drivers/8.3/source/atlantic-module-alt
index 3e605fd..d671a68 160000
--- a/drivers/8.3/source/atlantic-module-alt
+++ b/drivers/8.3/source/atlantic-module-alt
@@ -1 +1 @@
-Subproject commit 3e605fd0faa44699d47e0896d14bc4b2f6ca8de4
+Subproject commit d671a682c25ce329174230b890a918b27e32b846
diff --git a/drivers/8.3/source/avago-megaraid-sas b/drivers/8.3/source/avago-megaraid-sas
index 435bc76..2ea20fb 160000
--- a/drivers/8.3/source/avago-megaraid-sas
+++ b/drivers/8.3/source/avago-megaraid-sas
@@ -1 +1 @@
-Subproject commit 435bc7679b3de2f52341d867b1c97e5eb1542aac
+Subproject commit 2ea20fb0457b85406833801b6278e0d1302e2e2b
diff --git a/drivers/8.3/source/avago-mpt3sas b/drivers/8.3/source/avago-mpt3sas
index b09157f..93a182e 160000
--- a/drivers/8.3/source/avago-mpt3sas
+++ b/drivers/8.3/source/avago-mpt3sas
@@ -1 +1 @@
-Subproject commit b09157f9d936b2c57a92931efcc3256b27103699
+Subproject commit 93a182e87dc22c07ed9ac4b154ee7af7f91ddcd3
diff --git a/drivers/8.3/source/broadcom-bnxt-en b/drivers/8.3/source/broadcom-bnxt-en
index bd4f699..2f782b6 160000
--- a/drivers/8.3/source/broadcom-bnxt-en
+++ b/drivers/8.3/source/broadcom-bnxt-en
@@ -1 +1 @@
-Subproject commit bd4f69980cdad2af686f62361c590aa430d793f7
+Subproject commit 2f782b65b9a9835b306f54ac7fb1b88db11a32d5
diff --git a/drivers/8.3/source/broadcom-bnxt-en-alt b/drivers/8.3/source/broadcom-bnxt-en-alt
index bea9f3c..81c2626 160000
--- a/drivers/8.3/source/broadcom-bnxt-en-alt
+++ b/drivers/8.3/source/broadcom-bnxt-en-alt
@@ -1 +1 @@
-Subproject commit bea9f3ce2da6957706adb9fb6e1c802d08843ce5
+Subproject commit 81c262634451e46a96903cb448cb577ee7769482
diff --git a/drivers/8.3/source/chelsio-cxgb4 b/drivers/8.3/source/chelsio-cxgb4
index 88d8bce..c0f1715 160000
--- a/drivers/8.3/source/chelsio-cxgb4
+++ b/drivers/8.3/source/chelsio-cxgb4
@@ -1 +1 @@
-Subproject commit 88d8bcef38168eb65a6a74e716e98eacd687b008
+Subproject commit c0f17159f398fbcfee26a3e3b135978be1078ced
diff --git a/drivers/8.3/source/cisco-enic b/drivers/8.3/source/cisco-enic
index 9ee8f08..2e202fa 160000
--- a/drivers/8.3/source/cisco-enic
+++ b/drivers/8.3/source/cisco-enic
@@ -1 +1 @@
-Subproject commit 9ee8f085a00d92f3f78e965218e04a0faaa533d5
+Subproject commit 2e202fa9ad3856cdcf77da4f179f4f917dc7d8d3
diff --git a/drivers/8.3/source/cisco-enic-alt b/drivers/8.3/source/cisco-enic-alt
index e447df4..488d2e6 160000
--- a/drivers/8.3/source/cisco-enic-alt
+++ b/drivers/8.3/source/cisco-enic-alt
@@ -1 +1 @@
-Subproject commit e447df490c87bf5f3ae40bed4c277ad2a7399622
+Subproject commit 488d2e618316393f55e5f0efb8a6e7ab6aba4ac5
diff --git a/drivers/8.3/source/cisco-fnic b/drivers/8.3/source/cisco-fnic
index ae39f30..5f9dddb 160000
--- a/drivers/8.3/source/cisco-fnic
+++ b/drivers/8.3/source/cisco-fnic
@@ -1 +1 @@
-Subproject commit ae39f300b0fd22cb261d59f3740b4ce593dc30aa
+Subproject commit 5f9dddb34f15ffee944c3e851771c599ef799278
diff --git a/drivers/8.3/source/cisco-fnic-alt b/drivers/8.3/source/cisco-fnic-alt
index 67beed0..6cc8a71 160000
--- a/drivers/8.3/source/cisco-fnic-alt
+++ b/drivers/8.3/source/cisco-fnic-alt
@@ -1 +1 @@
-Subproject commit 67beed0aa30a837aeb7325ffa7ac98261dad4e49
+Subproject commit 6cc8a7140d475f1b8ffa445c03b9b99283d11636
diff --git a/drivers/8.3/source/coretemp-module-alt b/drivers/8.3/source/coretemp-module-alt
index 29f7cf7..72c6652 160000
--- a/drivers/8.3/source/coretemp-module-alt
+++ b/drivers/8.3/source/coretemp-module-alt
@@ -1 +1 @@
-Subproject commit 29f7cf7657a620702368b2b35894df64a4d2125d
+Subproject commit 72c6652502651aa63c83628166b9fe6a2cdd0a97
diff --git a/drivers/8.3/source/dell-rbu-module b/drivers/8.3/source/dell-rbu-module
index 3fc9a43..4a871a9 160000
--- a/drivers/8.3/source/dell-rbu-module
+++ b/drivers/8.3/source/dell-rbu-module
@@ -1 +1 @@
-Subproject commit 3fc9a43c699e5522a5c1666788e5895e8d84c8a2
+Subproject commit 4a871a9e7c53bd84d06da050f3d23012bc3de5e0
diff --git a/drivers/8.3/source/emulex-lpfc b/drivers/8.3/source/emulex-lpfc
index 29b8dc0..ffe52c7 160000
--- a/drivers/8.3/source/emulex-lpfc
+++ b/drivers/8.3/source/emulex-lpfc
@@ -1 +1 @@
-Subproject commit 29b8dc0c3be94dbfebb062ffd128e541c8a96d92
+Subproject commit ffe52c7cdd1bda25b1ba9aaf4c75d8ec8fa33145
diff --git a/drivers/8.3/source/emulex-lpfc-alt b/drivers/8.3/source/emulex-lpfc-alt
index b410514..a0b9fee 160000
--- a/drivers/8.3/source/emulex-lpfc-alt
+++ b/drivers/8.3/source/emulex-lpfc-alt
@@ -1 +1 @@
-Subproject commit b410514f2a4a7a9688272b315d15677666aa0678
+Subproject commit a0b9feedc978ee3129f8dd1a774258b78b320ffb
diff --git a/drivers/8.3/source/intel-e1000e b/drivers/8.3/source/intel-e1000e
index 1f845e9..5c76761 160000
--- a/drivers/8.3/source/intel-e1000e
+++ b/drivers/8.3/source/intel-e1000e
@@ -1 +1 @@
-Subproject commit 1f845e9985bb5c4ae6482a607c7a4491476e9d54
+Subproject commit 5c76761d0d1fe27058a186c0ed72ffe2526cde95
diff --git a/drivers/8.3/source/intel-e1000e-alt b/drivers/8.3/source/intel-e1000e-alt
index d24200a..fd80dad 160000
--- a/drivers/8.3/source/intel-e1000e-alt
+++ b/drivers/8.3/source/intel-e1000e-alt
@@ -1 +1 @@
-Subproject commit d24200ace490cfee6ef03a3632cc224ed410441a
+Subproject commit fd80dada142e1465e7b8d3773e6e4c0d45f00535
diff --git a/drivers/8.3/source/intel-fm10k b/drivers/8.3/source/intel-fm10k
index 5f2ef77..ad6f7c0 160000
--- a/drivers/8.3/source/intel-fm10k
+++ b/drivers/8.3/source/intel-fm10k
@@ -1 +1 @@
-Subproject commit 5f2ef7757702b6609846de576136ad41e3466e90
+Subproject commit ad6f7c031200fee2a407db4a4c4eaad762f460ce
diff --git a/drivers/8.3/source/intel-i40e b/drivers/8.3/source/intel-i40e
index 1188ee8..2dc8441 160000
--- a/drivers/8.3/source/intel-i40e
+++ b/drivers/8.3/source/intel-i40e
@@ -1 +1 @@
-Subproject commit 1188ee8df883fe69b36a37de99c96e1b81f31d22
+Subproject commit 2dc844132ff7d4b114a8a51ba28e892e015ae538
diff --git a/drivers/8.3/source/intel-i40e-alt b/drivers/8.3/source/intel-i40e-alt
index 0296304..f7a93a2 160000
--- a/drivers/8.3/source/intel-i40e-alt
+++ b/drivers/8.3/source/intel-i40e-alt
@@ -1 +1 @@
-Subproject commit 0296304ec65444ff6db3df8d69fdba01476d243e
+Subproject commit f7a93a2f8f742d1a8d4e87937b563efb38aec0ab
diff --git a/drivers/8.3/source/intel-ice b/drivers/8.3/source/intel-ice
index 6f89261..00b8fd8 160000
--- a/drivers/8.3/source/intel-ice
+++ b/drivers/8.3/source/intel-ice
@@ -1 +1 @@
-Subproject commit 6f89261ecc575d853b65feddff30a59f8b9898bd
+Subproject commit 00b8fd8803a17a436ef2ac1eb28249671d8a4b30
diff --git a/drivers/8.3/source/intel-ice-alt b/drivers/8.3/source/intel-ice-alt
index 702a6cf..40747b3 160000
--- a/drivers/8.3/source/intel-ice-alt
+++ b/drivers/8.3/source/intel-ice-alt
@@ -1 +1 @@
-Subproject commit 702a6cf72d9bf5fbdac444da5e21151215e684b9
+Subproject commit 40747b37b41382925b99950044d6e5777c213911
diff --git a/drivers/8.3/source/intel-igb b/drivers/8.3/source/intel-igb
index 5cd360b..66c9161 160000
--- a/drivers/8.3/source/intel-igb
+++ b/drivers/8.3/source/intel-igb
@@ -1 +1 @@
-Subproject commit 5cd360bc6d7c59a2df5dc90ff9104daef4364e46
+Subproject commit 66c9161971a59178a5372eb2d127f2c3a638a612
diff --git a/drivers/8.3/source/intel-igb-alt b/drivers/8.3/source/intel-igb-alt
index 09b4b6e..ad9b2e5 160000
--- a/drivers/8.3/source/intel-igb-alt
+++ b/drivers/8.3/source/intel-igb-alt
@@ -1 +1 @@
-Subproject commit 09b4b6e935aa3fd4f288c7d84581013637117d20
+Subproject commit ad9b2e55bd6451a50703af0bc300cf7f4c8d4493
diff --git a/drivers/8.3/source/intel-igc b/drivers/8.3/source/intel-igc
index db83d35..c919159 160000
--- a/drivers/8.3/source/intel-igc
+++ b/drivers/8.3/source/intel-igc
@@ -1 +1 @@
-Subproject commit db83d35fce8c74559a6fb3642bef51226df7731c
+Subproject commit c9191592d41a5d4567ec9ca15d480ea168eabbe0
diff --git a/drivers/8.3/source/intel-ixgbe b/drivers/8.3/source/intel-ixgbe
index 0963824..d957b8e 160000
--- a/drivers/8.3/source/intel-ixgbe
+++ b/drivers/8.3/source/intel-ixgbe
@@ -1 +1 @@
-Subproject commit 09638249336ba927ef0d02fdfd40b4c422c3e188
+Subproject commit d957b8eb5cd4135ed68cfc0387b0b96fb565f721
diff --git a/drivers/8.3/source/intel-ixgbe-alt b/drivers/8.3/source/intel-ixgbe-alt
index 18e3668..c65b5c9 160000
--- a/drivers/8.3/source/intel-ixgbe-alt
+++ b/drivers/8.3/source/intel-ixgbe-alt
@@ -1 +1 @@
-Subproject commit 18e3668280285cc10d0de3a92aadaa885e4677d6
+Subproject commit c65b5c963431493541b81d1513e7589101204c62
diff --git a/drivers/8.3/source/mellanox-mlnxen b/drivers/8.3/source/mellanox-mlnxen
index 6823379..09502cb 160000
--- a/drivers/8.3/source/mellanox-mlnxen
+++ b/drivers/8.3/source/mellanox-mlnxen
@@ -1 +1 @@
-Subproject commit 6823379ba1980c4892e0446167fac18b44d9d4a6
+Subproject commit 09502cb39181918b8887b352e9cf8dfe89bfee9b
diff --git a/drivers/8.3/source/mellanox-mlnxen-alt b/drivers/8.3/source/mellanox-mlnxen-alt
index cf1b7ee..951b176 160000
--- a/drivers/8.3/source/mellanox-mlnxen-alt
+++ b/drivers/8.3/source/mellanox-mlnxen-alt
@@ -1 +1 @@
-Subproject commit cf1b7eec86f2cf4c1bed76ad701dfb4beef99fad
+Subproject commit 951b176eca5a8eca6050aa786bad6aef82d4a5ff
diff --git a/drivers/8.3/source/microsemi-aacraid b/drivers/8.3/source/microsemi-aacraid
index 491194e..c5124e9 160000
--- a/drivers/8.3/source/microsemi-aacraid
+++ b/drivers/8.3/source/microsemi-aacraid
@@ -1 +1 @@
-Subproject commit 491194e9d88d8ff5052a2f3191fcd7bd8abb633a
+Subproject commit c5124e9d61c91169f11538ca8e1f7696a94413af
diff --git a/drivers/8.3/source/microsemi-smartpqi b/drivers/8.3/source/microsemi-smartpqi
index 3b70e23..aee12a4 160000
--- a/drivers/8.3/source/microsemi-smartpqi
+++ b/drivers/8.3/source/microsemi-smartpqi
@@ -1 +1 @@
-Subproject commit 3b70e23f5e9748d94f2603a534c0fb14fd8514d8
+Subproject commit aee12a45979fda2058880ac92e75617a43e66cf5
diff --git a/drivers/8.3/source/microsemi-smartpqi-alt b/drivers/8.3/source/microsemi-smartpqi-alt
index c41ea96..616f8a8 160000
--- a/drivers/8.3/source/microsemi-smartpqi-alt
+++ b/drivers/8.3/source/microsemi-smartpqi-alt
@@ -1 +1 @@
-Subproject commit c41ea962eda063b85e4934ac26cbf86b35e28d4e
+Subproject commit 616f8a8fb3a9dfd58e232d11c57bdc10c2d93654
diff --git a/drivers/8.3/source/mlx4-modules-alt b/drivers/8.3/source/mlx4-modules-alt
index aa036c8..f58623a 160000
--- a/drivers/8.3/source/mlx4-modules-alt
+++ b/drivers/8.3/source/mlx4-modules-alt
@@ -1 +1 @@
-Subproject commit aa036c8978b485119a7bd6b2643b9a8a287bfbea
+Subproject commit f58623a728c59d945e94844efa1149d25abde13b
diff --git a/drivers/8.3/source/mpi3mr-module b/drivers/8.3/source/mpi3mr-module
index 5c178a6..b306695 160000
--- a/drivers/8.3/source/mpi3mr-module
+++ b/drivers/8.3/source/mpi3mr-module
@@ -1 +1 @@
-Subproject commit 5c178a63a3523a06ca9bf1a97fddc204d018c8f5
+Subproject commit b3066954d1e365ad18797154c67b7514353e26c0
diff --git a/drivers/8.3/source/qlogic-fastlinq b/drivers/8.3/source/qlogic-fastlinq
index 83cf6ed..de2a89b 160000
--- a/drivers/8.3/source/qlogic-fastlinq
+++ b/drivers/8.3/source/qlogic-fastlinq
@@ -1 +1 @@
-Subproject commit 83cf6ed87aaf59986bf06183cca5e587275ceb9f
+Subproject commit de2a89b65698f07355d197e0fce60784f46b3bc1
diff --git a/drivers/8.3/source/qlogic-fastlinq-alt b/drivers/8.3/source/qlogic-fastlinq-alt
index fd7dcc6..36e3f09 160000
--- a/drivers/8.3/source/qlogic-fastlinq-alt
+++ b/drivers/8.3/source/qlogic-fastlinq-alt
@@ -1 +1 @@
-Subproject commit fd7dcc62d22067f6448d095fc108d383ee9a724c
+Subproject commit 36e3f09048cad71df844fca92c397e93a1384e91
diff --git a/drivers/8.3/source/qlogic-qla2xxx b/drivers/8.3/source/qlogic-qla2xxx
index 1035617..c0b34a7 160000
--- a/drivers/8.3/source/qlogic-qla2xxx
+++ b/drivers/8.3/source/qlogic-qla2xxx
@@ -1 +1 @@
-Subproject commit 1035617f82cec689ba063d0f831566c6383752c8
+Subproject commit c0b34a75e3cf2237e83021398bfad6101d9a37d2
diff --git a/drivers/8.3/source/qlogic-qla2xxx-alt b/drivers/8.3/source/qlogic-qla2xxx-alt
index 7bc22d7..15f279e 160000
--- a/drivers/8.3/source/qlogic-qla2xxx-alt
+++ b/drivers/8.3/source/qlogic-qla2xxx-alt
@@ -1 +1 @@
-Subproject commit 7bc22d77faaf3ce2bca8b0dc3381a3328cefe7f9
+Subproject commit 15f279e95e96631bc1e739c99a881b3fec205ac0
diff --git a/drivers/8.3/source/r8125-module b/drivers/8.3/source/r8125-module
index ec28a94..a012236 160000
--- a/drivers/8.3/source/r8125-module
+++ b/drivers/8.3/source/r8125-module
@@ -1 +1 @@
-Subproject commit ec28a949c834b7532d28db77a12648ecc959de2e
+Subproject commit a01223654c3b1800d3424109ebb39d71175df222
diff --git a/drivers/8.3/source/r8169-module-alt b/drivers/8.3/source/r8169-module-alt
index 8ece201..4906eaa 160000
--- a/drivers/8.3/source/r8169-module-alt
+++ b/drivers/8.3/source/r8169-module-alt
@@ -1 +1 @@
-Subproject commit 8ece201548404ce0b1e4a2f92717e889d0c87487
+Subproject commit 4906eaac1241dd33e1e3d5fa81286ab8266e32d5
diff --git a/drivers/8.3/source/sfc-module-alt b/drivers/8.3/source/sfc-module-alt
index 2f3fd6a..1f62a6b 160000
--- a/drivers/8.3/source/sfc-module-alt
+++ b/drivers/8.3/source/sfc-module-alt
@@ -1 +1 @@
-Subproject commit 2f3fd6a457f4bd70ddd1f65b90d5bb2e0112614f
+Subproject commit 1f62a6bb10c603a399bd660d96beb745c1ed5142
diff --git a/drivers/8.3/source/tg3-module-alt b/drivers/8.3/source/tg3-module-alt
index c621e39..8d09663 160000
--- a/drivers/8.3/source/tg3-module-alt
+++ b/drivers/8.3/source/tg3-module-alt
@@ -1 +1 @@
-Subproject commit c621e390884e49af21e753e7672bc0042b08b49f
+Subproject commit 8d09663dd65cdce3d1b61f54e954e207a6b0c73e
diff --git a/drivers/README.md b/drivers/README.md
index 3ded109..bb567ad 100644
--- a/drivers/README.md
+++ b/drivers/README.md
@@ -15,33 +15,33 @@
 | Package | Main driver | Alternate Driver | XS 8.3 Base | XS 8.3 early access |
 |---------|-------------|------------------|-------------|---------------------|
 | aqc111u-module 📥 | [📜](https://github.com/xcp-ng-rpms/aqc111u-module/blob/c35fb60911ae11abde74a2de73199c05fe8141c8) [1.3.3.0-2](https://github.com/xcp-ng-rpms/aqc111u-module/blob/90ccc63964773e1c02e873704f130c82f9f12887)   |   |  |  |
-| atlantic-module 📥 |    | [📜](https://github.com/xcp-ng-rpms/atlantic-module/blob/3e605fd0faa44699d47e0896d14bc4b2f6ca8de4) [2.5.12-1](https://github.com/xcp-ng-rpms/atlantic-module/blob/d998a428ff01409a7b94440297af107abce7d870)  |  |  |
+| atlantic-module 📥 |    | [📜](https://github.com/xcp-ng-rpms/atlantic-module-alt/blob/3e605fd0faa44699d47e0896d14bc4b2f6ca8de4) [2.5.12-1](https://github.com/xcp-ng-rpms/atlantic-module-alt/blob/d998a428ff01409a7b94440297af107abce7d870)  |  |  |
 | avago-megaraid-sas  | [📜](https://github.com/xcp-ng-rpms/avago-megaraid-sas/blob/435bc7679b3de2f52341d867b1c97e5eb1542aac) [07.713.01.00+rc1-3](https://github.com/xcp-ng-rpms/avago-megaraid-sas/blob/435ab253071933a5f009ddeb9e27881754a2bceb)   |   |  |  |
 | avago-mpt3sas  | [📜](https://github.com/xcp-ng-rpms/avago-mpt3sas/blob/b09157f9d936b2c57a92931efcc3256b27103699) [38.00.00.00-1](https://github.com/xcp-ng-rpms/avago-mpt3sas/blob/4f7021bf699148b8c66627e610602defef79dede)   |   |  |  |
-| broadcom-bnxt-en  | [📜](https://github.com/xcp-ng-rpms/broadcom-bnxt-en/blob/bd4f69980cdad2af686f62361c590aa430d793f7) [1.10.3_237.1.20.0-8.1](https://github.com/xcp-ng-rpms/broadcom-bnxt-en/blob/74b65af1d8ca0bf2f3e7c3a71e8b52a57e64fe41) ↑ [💾](https://updates.xcp-ng.org/isos/drivers/8.x/broadcom-bnxt-en-1.10.3_232.0.155.5+1.xcpng8.3+pack.0.1.iso)  | [📜](https://github.com/xcp-ng-rpms/broadcom-bnxt-en/blob/bea9f3ce2da6957706adb9fb6e1c802d08843ce5) [1.10.3_232.0.155.5-1](https://github.com/xcp-ng-rpms/broadcom-bnxt-en/blob/9c6673b918938d7c15e1383c6065543aed22104d)  | 1.10.1_216.1.123.0-1 | 1.10.3_232.0.155.5 |
+| broadcom-bnxt-en  | [📜](https://github.com/xcp-ng-rpms/broadcom-bnxt-en/blob/bd4f69980cdad2af686f62361c590aa430d793f7) [1.10.3_237.1.20.0-8.1](https://github.com/xcp-ng-rpms/broadcom-bnxt-en/blob/74b65af1d8ca0bf2f3e7c3a71e8b52a57e64fe41) ↑ [💾](https://updates.xcp-ng.org/isos/drivers/8.x/broadcom-bnxt-en-1.10.3_232.0.155.5+1.xcpng8.3+pack.0.1.iso)  | [📜](https://github.com/xcp-ng-rpms/broadcom-bnxt-en-alt/blob/bea9f3ce2da6957706adb9fb6e1c802d08843ce5) [1.10.3_232.0.155.5-1](https://github.com/xcp-ng-rpms/broadcom-bnxt-en-alt/blob/9c6673b918938d7c15e1383c6065543aed22104d)  | 1.10.1_216.1.123.0-1 | 1.10.3_232.0.155.5 |
 | chelsio-cxgb4  | [📜](https://github.com/xcp-ng-rpms/chelsio-cxgb4/blob/88d8bcef38168eb65a6a74e716e98eacd687b008) [1.0.1-4](https://github.com/xcp-ng-rpms/chelsio-cxgb4/blob/384d7d13fca4c13d0e9cfe39951345b32bed1012)   |   |  |  |
-| cisco-enic  | [📜](https://github.com/xcp-ng-rpms/cisco-enic/blob/9ee8f085a00d92f3f78e965218e04a0faaa533d5) [4.5.0.7-1](https://github.com/xcp-ng-rpms/cisco-enic/blob/efb4ac8721d47d5f542f0e60bddec9686f023acd) ↑   | [📜](https://github.com/xcp-ng-rpms/cisco-enic/blob/e447df490c87bf5f3ae40bed4c277ad2a7399622) [4.4.0.1-1](https://github.com/xcp-ng-rpms/cisco-enic/blob/23fb3988ab8c6ba297c82f87a4eaf48a9dfe6c40)  | 4.2.0.26-1 | 4.5.0.7-1 |
-| cisco-fnic  | [📜](https://github.com/xcp-ng-rpms/cisco-fnic/blob/ae39f300b0fd22cb261d59f3740b4ce593dc30aa) [2.0.0.90-1.1](https://github.com/xcp-ng-rpms/cisco-fnic/blob/5b6b7eb748662cbbf6d7b389973273919a12ad0d) ↑   | [📜](https://github.com/xcp-ng-rpms/cisco-fnic/blob/67beed0aa30a837aeb7325ffa7ac98261dad4e49) [2.0.0.89-1](https://github.com/xcp-ng-rpms/cisco-fnic/blob/7268c31566fbf6b43c0c532776947cc8b1126159)  | 2.0.0.85-1 | 2.0.0.90-1 |
-| coretemp-module 📥 |    | [📜](https://github.com/xcp-ng-rpms/coretemp-module/blob/29f7cf7657a620702368b2b35894df64a4d2125d) [1.0-4](https://github.com/xcp-ng-rpms/coretemp-module/blob/de32a4404976bd94f42402c672165dbb0cfac712)  |  |  |
+| cisco-enic  | [📜](https://github.com/xcp-ng-rpms/cisco-enic/blob/9ee8f085a00d92f3f78e965218e04a0faaa533d5) [4.5.0.7-1](https://github.com/xcp-ng-rpms/cisco-enic/blob/efb4ac8721d47d5f542f0e60bddec9686f023acd) ↑   | [📜](https://github.com/xcp-ng-rpms/cisco-enic-alt/blob/e447df490c87bf5f3ae40bed4c277ad2a7399622) [4.4.0.1-1](https://github.com/xcp-ng-rpms/cisco-enic-alt/blob/23fb3988ab8c6ba297c82f87a4eaf48a9dfe6c40)  | 4.2.0.26-1 | 4.5.0.7-1 |
+| cisco-fnic  | [📜](https://github.com/xcp-ng-rpms/cisco-fnic/blob/ae39f300b0fd22cb261d59f3740b4ce593dc30aa) [2.0.0.90-1.1](https://github.com/xcp-ng-rpms/cisco-fnic/blob/5b6b7eb748662cbbf6d7b389973273919a12ad0d) ↑   | [📜](https://github.com/xcp-ng-rpms/cisco-fnic-alt/blob/67beed0aa30a837aeb7325ffa7ac98261dad4e49) [2.0.0.89-1](https://github.com/xcp-ng-rpms/cisco-fnic-alt/blob/7268c31566fbf6b43c0c532776947cc8b1126159)  | 2.0.0.85-1 | 2.0.0.90-1 |
+| coretemp-module 📥 |    | [📜](https://github.com/xcp-ng-rpms/coretemp-module-alt/blob/29f7cf7657a620702368b2b35894df64a4d2125d) [1.0-4](https://github.com/xcp-ng-rpms/coretemp-module-alt/blob/de32a4404976bd94f42402c672165dbb0cfac712)  |  |  |
 | dell-rbu-module 📥 | [📜](https://github.com/xcp-ng-rpms/dell-rbu-module/blob/3fc9a43c699e5522a5c1666788e5895e8d84c8a2) [4.19.0+1-3](https://github.com/xcp-ng-rpms/dell-rbu-module/blob/854b99f7fec992b55c1b31e4fe3df51bc2f065ba)   |   |  |  |
-| emulex-lpfc  | [📜](https://github.com/xcp-ng-rpms/emulex-lpfc/blob/29b8dc0c3be94dbfebb062ffd128e541c8a96d92) [12.0.0.10-3](https://github.com/xcp-ng-rpms/emulex-lpfc/blob/a97d190a3ea83af274c0512ef4d1d8fc73c7063f)   | [📜](https://github.com/xcp-ng-rpms/emulex-lpfc/blob/b410514f2a4a7a9688272b315d15677666aa0678) [14.4.393.31-1.1](https://github.com/xcp-ng-rpms/emulex-lpfc/blob/3b2ee40d2debf455a60f6587a45cac8003dd02ed) ↑ [💿](https://updates.xcp-ng.org/isos/drivers/8.x/emulex-lpfc-alt-14.4.393.31+1.1.xcpng8.3+pack.0.1.iso) | 12.0.0.10-3 |  |
-| intel-e1000e  | [📜](https://github.com/xcp-ng-rpms/intel-e1000e/blob/1f845e9985bb5c4ae6482a607c7a4491476e9d54) [5.10.179-2](https://github.com/xcp-ng-rpms/intel-e1000e/blob/36b8d8dea096063936e9f9e4e87493f3765922ed) ↑   | [📜](https://github.com/xcp-ng-rpms/intel-e1000e/blob/d24200ace490cfee6ef03a3632cc224ed410441a) [3.8.7-1](https://github.com/xcp-ng-rpms/intel-e1000e/blob/24965e07e61fb152879b092be745065e1e8766e3)  | 3.8.7-2 |  |
+| emulex-lpfc  | [📜](https://github.com/xcp-ng-rpms/emulex-lpfc/blob/29b8dc0c3be94dbfebb062ffd128e541c8a96d92) [12.0.0.10-3](https://github.com/xcp-ng-rpms/emulex-lpfc/blob/a97d190a3ea83af274c0512ef4d1d8fc73c7063f)   | [📜](https://github.com/xcp-ng-rpms/emulex-lpfc-alt/blob/b410514f2a4a7a9688272b315d15677666aa0678) [14.4.393.31-1.1](https://github.com/xcp-ng-rpms/emulex-lpfc-alt/blob/3b2ee40d2debf455a60f6587a45cac8003dd02ed) ↑ [💿](https://updates.xcp-ng.org/isos/drivers/8.x/emulex-lpfc-alt-14.4.393.31+1.1.xcpng8.3+pack.0.1.iso) | 12.0.0.10-3 |  |
+| intel-e1000e  | [📜](https://github.com/xcp-ng-rpms/intel-e1000e/blob/1f845e9985bb5c4ae6482a607c7a4491476e9d54) [5.10.179-2](https://github.com/xcp-ng-rpms/intel-e1000e/blob/36b8d8dea096063936e9f9e4e87493f3765922ed) ↑   | [📜](https://github.com/xcp-ng-rpms/intel-e1000e-alt/blob/d24200ace490cfee6ef03a3632cc224ed410441a) [3.8.7-1](https://github.com/xcp-ng-rpms/intel-e1000e-alt/blob/24965e07e61fb152879b092be745065e1e8766e3)  | 3.8.7-2 |  |
 | intel-fm10k  | [📜](https://github.com/xcp-ng-rpms/intel-fm10k/blob/5f2ef7757702b6609846de576136ad41e3466e90) [0.26.1-3](https://github.com/xcp-ng-rpms/intel-fm10k/blob/ec022f4019a99f28f10ad1e3e9f62df344bf45af)   |   |  |  |
-| intel-i40e  | [📜](https://github.com/xcp-ng-rpms/intel-i40e/blob/1188ee8df883fe69b36a37de99c96e1b81f31d22) [2.25.11-4](https://github.com/xcp-ng-rpms/intel-i40e/blob/a66b0f8aa567ebb94aec9ec1a336d3abeffd1be4)   | [📜](https://github.com/xcp-ng-rpms/intel-i40e/blob/0296304ec65444ff6db3df8d69fdba01476d243e) [2.26.8-1](https://github.com/xcp-ng-rpms/intel-i40e/blob/8080ca3934ba5faccb54556eee0c1621e18988fd) ↑  | 2.9.21-3 | 2.25.11-2 |
-| intel-ice  | [📜](https://github.com/xcp-ng-rpms/intel-ice/blob/6f89261ecc575d853b65feddff30a59f8b9898bd) [1.15.5-2](https://github.com/xcp-ng-rpms/intel-ice/blob/9e3babe3859b4d7d3a9ffb73774498c390d64824)   | [📜](https://github.com/xcp-ng-rpms/intel-ice/blob/702a6cf72d9bf5fbdac444da5e21151215e684b9) [1.17.2-1](https://github.com/xcp-ng-rpms/intel-ice/blob/8f8cabf3f010cbae609b4d936eba4dd8f9d0b9f4) ↑  | 1.6.4-4 | 1.17.1-2 |
-| intel-igb  | [📜](https://github.com/xcp-ng-rpms/intel-igb/blob/5cd360bc6d7c59a2df5dc90ff9104daef4364e46) [5.13.20-2](https://github.com/xcp-ng-rpms/intel-igb/blob/67880a56a8875c7b0b669fda14a31569359c2389) ↑   | [📜](https://github.com/xcp-ng-rpms/intel-igb/blob/09b4b6e935aa3fd4f288c7d84581013637117d20) [5.4.6-2](https://github.com/xcp-ng-rpms/intel-igb/blob/a14a658e7d7b4aae69cd18a55b4a898c8fe8b511)  | 5.3.5.20-3 | 5.13.20-2 |
+| intel-i40e  | [📜](https://github.com/xcp-ng-rpms/intel-i40e/blob/1188ee8df883fe69b36a37de99c96e1b81f31d22) [2.25.11-4](https://github.com/xcp-ng-rpms/intel-i40e/blob/a66b0f8aa567ebb94aec9ec1a336d3abeffd1be4)   | [📜](https://github.com/xcp-ng-rpms/intel-i40e-alt/blob/0296304ec65444ff6db3df8d69fdba01476d243e) [2.26.8-1](https://github.com/xcp-ng-rpms/intel-i40e-alt/blob/8080ca3934ba5faccb54556eee0c1621e18988fd) ↑  | 2.9.21-3 | 2.25.11-2 |
+| intel-ice  | [📜](https://github.com/xcp-ng-rpms/intel-ice/blob/6f89261ecc575d853b65feddff30a59f8b9898bd) [1.15.5-2](https://github.com/xcp-ng-rpms/intel-ice/blob/9e3babe3859b4d7d3a9ffb73774498c390d64824)   | [📜](https://github.com/xcp-ng-rpms/intel-ice-alt/blob/702a6cf72d9bf5fbdac444da5e21151215e684b9) [1.17.2-1](https://github.com/xcp-ng-rpms/intel-ice-alt/blob/8f8cabf3f010cbae609b4d936eba4dd8f9d0b9f4) ↑  | 1.6.4-4 | 1.17.1-2 |
+| intel-igb  | [📜](https://github.com/xcp-ng-rpms/intel-igb/blob/5cd360bc6d7c59a2df5dc90ff9104daef4364e46) [5.13.20-2](https://github.com/xcp-ng-rpms/intel-igb/blob/67880a56a8875c7b0b669fda14a31569359c2389) ↑   | [📜](https://github.com/xcp-ng-rpms/intel-igb-alt/blob/09b4b6e935aa3fd4f288c7d84581013637117d20) [5.4.6-2](https://github.com/xcp-ng-rpms/intel-igb-alt/blob/a14a658e7d7b4aae69cd18a55b4a898c8fe8b511)  | 5.3.5.20-3 | 5.13.20-2 |
 | intel-igc  | [📜](https://github.com/xcp-ng-rpms/intel-igc/blob/db83d35fce8c74559a6fb3642bef51226df7731c) [5.10.226-2](https://github.com/xcp-ng-rpms/intel-igc/blob/cea6b3a403f6aa5f69f9c199dad2f37a68c1600e)   |   |  | 5.10.214-3 |
-| intel-ixgbe  | [📜](https://github.com/xcp-ng-rpms/intel-ixgbe/blob/09638249336ba927ef0d02fdfd40b4c422c3e188) [6.2.5-1](https://github.com/xcp-ng-rpms/intel-ixgbe/blob/820b7ae3351c9c36d64f7907d98aeb54933b7b53) ↑ [💿](https://updates.xcp-ng.org/isos/drivers/8.x/intel-ixgbe-6.2.5+1.xcpng8.3+pack.0.1.iso)  | [📜](https://github.com/xcp-ng-rpms/intel-ixgbe/blob/18e3668280285cc10d0de3a92aadaa885e4677d6) [5.9.4-2](https://github.com/xcp-ng-rpms/intel-ixgbe/blob/5e1b5e5a02fd9a5f9049088ffee9d917ed6a6458)  | 5.18.6-1 |  |
-| mellanox-mlnxen  | [📜](https://github.com/xcp-ng-rpms/mellanox-mlnxen/blob/6823379ba1980c4892e0446167fac18b44d9d4a6) [5.9_0.5.5.0-3.1](https://github.com/xcp-ng-rpms/mellanox-mlnxen/blob/113c71dc62ba2f57f9420a0aa262cdde76a9be84) ↑   | [📜](https://github.com/xcp-ng-rpms/mellanox-mlnxen/blob/cf1b7eec86f2cf4c1bed76ad701dfb4beef99fad) [5.4_1.0.3.0-3](https://github.com/xcp-ng-rpms/mellanox-mlnxen/blob/da547b10ca60d6c6bc40f769bed917536dfc0e10)  | 5.4_1.0.3.0-3 | 5.9_0.5.5.0-3 |
+| intel-ixgbe  | [📜](https://github.com/xcp-ng-rpms/intel-ixgbe/blob/09638249336ba927ef0d02fdfd40b4c422c3e188) [6.2.5-1](https://github.com/xcp-ng-rpms/intel-ixgbe/blob/820b7ae3351c9c36d64f7907d98aeb54933b7b53) ↑ [💿](https://updates.xcp-ng.org/isos/drivers/8.x/intel-ixgbe-6.2.5+1.xcpng8.3+pack.0.1.iso)  | [📜](https://github.com/xcp-ng-rpms/intel-ixgbe-alt/blob/18e3668280285cc10d0de3a92aadaa885e4677d6) [5.9.4-2](https://github.com/xcp-ng-rpms/intel-ixgbe-alt/blob/5e1b5e5a02fd9a5f9049088ffee9d917ed6a6458)  | 5.18.6-1 |  |
+| mellanox-mlnxen  | [📜](https://github.com/xcp-ng-rpms/mellanox-mlnxen/blob/6823379ba1980c4892e0446167fac18b44d9d4a6) [5.9_0.5.5.0-3.1](https://github.com/xcp-ng-rpms/mellanox-mlnxen/blob/113c71dc62ba2f57f9420a0aa262cdde76a9be84) ↑   | [📜](https://github.com/xcp-ng-rpms/mellanox-mlnxen-alt/blob/cf1b7eec86f2cf4c1bed76ad701dfb4beef99fad) [5.4_1.0.3.0-3](https://github.com/xcp-ng-rpms/mellanox-mlnxen-alt/blob/da547b10ca60d6c6bc40f769bed917536dfc0e10)  | 5.4_1.0.3.0-3 | 5.9_0.5.5.0-3 |
 | microsemi-aacraid  | [📜](https://github.com/xcp-ng-rpms/microsemi-aacraid/blob/491194e9d88d8ff5052a2f3191fcd7bd8abb633a) [1.2.1.60001-1](https://github.com/xcp-ng-rpms/microsemi-aacraid/blob/9e86f16f948d2c81c859152494ba17e482fe74f6)   |   |  |  |
-| microsemi-smartpqi  | [📜](https://github.com/xcp-ng-rpms/microsemi-smartpqi/blob/3b70e23f5e9748d94f2603a534c0fb14fd8514d8) [2.1.30_031-1](https://github.com/xcp-ng-rpms/microsemi-smartpqi/blob/db865b21bc039548f4b58d1d9a895604984743fc) ↑   | [📜](https://github.com/xcp-ng-rpms/microsemi-smartpqi/blob/c41ea962eda063b85e4934ac26cbf86b35e28d4e) [2.1.28_025-1](https://github.com/xcp-ng-rpms/microsemi-smartpqi/blob/ef61d976184df30539f85b7109a5634ced1976bc)  | 2.1.20_035-1 | 2.1.30_031 |
-| mlx4-modules  |    | [📜](https://github.com/xcp-ng-rpms/mlx4-modules/blob/aa036c8978b485119a7bd6b2643b9a8a287bfbea) [4.9_7.1.0.0-1](https://github.com/xcp-ng-rpms/mlx4-modules/blob/65ebc807f20dee76a05587074df491a758af2ec9)  |  |  |
+| microsemi-smartpqi  | [📜](https://github.com/xcp-ng-rpms/microsemi-smartpqi/blob/3b70e23f5e9748d94f2603a534c0fb14fd8514d8) [2.1.30_031-1](https://github.com/xcp-ng-rpms/microsemi-smartpqi/blob/db865b21bc039548f4b58d1d9a895604984743fc) ↑   | [📜](https://github.com/xcp-ng-rpms/microsemi-smartpqi-alt/blob/c41ea962eda063b85e4934ac26cbf86b35e28d4e) [2.1.28_025-1](https://github.com/xcp-ng-rpms/microsemi-smartpqi-alt/blob/ef61d976184df30539f85b7109a5634ced1976bc)  | 2.1.20_035-1 | 2.1.30_031 |
+| mlx4-modules  |    | [📜](https://github.com/xcp-ng-rpms/mlx4-modules-alt/blob/aa036c8978b485119a7bd6b2643b9a8a287bfbea) [4.9_7.1.0.0-1](https://github.com/xcp-ng-rpms/mlx4-modules-alt/blob/65ebc807f20dee76a05587074df491a758af2ec9)  |  |  |
 | mpi3mr-module 📥 | [📜](https://github.com/xcp-ng-rpms/mpi3mr-module/blob/5c178a63a3523a06ca9bf1a97fddc204d018c8f5) [8.6.1.0.0-1](https://github.com/xcp-ng-rpms/mpi3mr-module/blob/e5efd450dc6cf63f6cfbf1a525a6665c190d032d) [💿](https://updates.xcp-ng.org/isos/drivers/8.x/mpi3mr-module-8.6.1.0.0+1.xcpng8.3+pack.0.1.iso)  |   |  |  |
-| qlogic-fastlinq  | [📜](https://github.com/xcp-ng-rpms/qlogic-fastlinq/blob/83cf6ed87aaf59986bf06183cca5e587275ceb9f) [8.74.0.2-1](https://github.com/xcp-ng-rpms/qlogic-fastlinq/blob/00ac1c055f916b5b3a8cb2534bdbd62444a898f5) ↑   | [📜](https://github.com/xcp-ng-rpms/qlogic-fastlinq/blob/fd7dcc62d22067f6448d095fc108d383ee9a724c) [8.70.12.0-1](https://github.com/xcp-ng-rpms/qlogic-fastlinq/blob/5a998da700c4de33133ce71de939395b42a9ea16)  | 8.55.13.0-1 | 8.74.0.2-1 |
-| qlogic-netxtreme2  | [📜](https://github.com/xcp-ng-rpms/qlogic-netxtreme2/blob/a0d5c1da8fbac098fe9414d9ec3cd3e3e6cae56c) [7.14.76-2.1](https://github.com/xcp-ng-rpms/qlogic-netxtreme2/blob/86cef5150b611d5ba32ab0814c08b1ffe1925b1b)   | [📜](https://github.com/xcp-ng-rpms/qlogic-netxtreme2/blob/53a3c235eec333e5c6179a1d49076ced0eef1d95) [7.15.24-1](https://github.com/xcp-ng-rpms/qlogic-netxtreme2/blob/6a2b48cd7587e5ec8a9666ad3fc10a6a07645f49) ↑  | 7.14.76-2 |  |
-| qlogic-qla2xxx  | [📜](https://github.com/xcp-ng-rpms/qlogic-qla2xxx/blob/1035617f82cec689ba063d0f831566c6383752c8) [10.02.13.00_k-1](https://github.com/xcp-ng-rpms/qlogic-qla2xxx/blob/47ced4c06801a56c99a4d9148e512469bbe7f376)   | [📜](https://github.com/xcp-ng-rpms/qlogic-qla2xxx/blob/7bc22d77faaf3ce2bca8b0dc3381a3328cefe7f9) [10.02.14.01_k-1](https://github.com/xcp-ng-rpms/qlogic-qla2xxx/blob/5f4f028bf50c7b73452b70a9425fc6d095b6f9c2) ↑  | 10.02.08.01_k-1 | 10.02.13.00_k-1 |
+| qlogic-fastlinq  | [📜](https://github.com/xcp-ng-rpms/qlogic-fastlinq/blob/83cf6ed87aaf59986bf06183cca5e587275ceb9f) [8.74.0.2-1](https://github.com/xcp-ng-rpms/qlogic-fastlinq/blob/00ac1c055f916b5b3a8cb2534bdbd62444a898f5) ↑   | [📜](https://github.com/xcp-ng-rpms/qlogic-fastlinq-alt/blob/fd7dcc62d22067f6448d095fc108d383ee9a724c) [8.70.12.0-1](https://github.com/xcp-ng-rpms/qlogic-fastlinq-alt/blob/5a998da700c4de33133ce71de939395b42a9ea16)  | 8.55.13.0-1 | 8.74.0.2-1 |
+| qlogic-netxtreme2  | [📜](https://github.com/xcp-ng-rpms/qlogic-netxtreme2/blob/a0d5c1da8fbac098fe9414d9ec3cd3e3e6cae56c) [7.14.76-2.1](https://github.com/xcp-ng-rpms/qlogic-netxtreme2/blob/86cef5150b611d5ba32ab0814c08b1ffe1925b1b)   | [📜](https://github.com/xcp-ng-rpms/qlogic-netxtreme2-alt/blob/53a3c235eec333e5c6179a1d49076ced0eef1d95) [7.15.24-1](https://github.com/xcp-ng-rpms/qlogic-netxtreme2-alt/blob/6a2b48cd7587e5ec8a9666ad3fc10a6a07645f49) ↑  | 7.14.76-2 |  |
+| qlogic-qla2xxx  | [📜](https://github.com/xcp-ng-rpms/qlogic-qla2xxx/blob/1035617f82cec689ba063d0f831566c6383752c8) [10.02.13.00_k-1](https://github.com/xcp-ng-rpms/qlogic-qla2xxx/blob/47ced4c06801a56c99a4d9148e512469bbe7f376)   | [📜](https://github.com/xcp-ng-rpms/qlogic-qla2xxx-alt/blob/7bc22d77faaf3ce2bca8b0dc3381a3328cefe7f9) [10.02.14.01_k-1](https://github.com/xcp-ng-rpms/qlogic-qla2xxx-alt/blob/5f4f028bf50c7b73452b70a9425fc6d095b6f9c2) ↑  | 10.02.08.01_k-1 | 10.02.13.00_k-1 |
 | r8125-module 📥 | [📜](https://github.com/xcp-ng-rpms/r8125-module/blob/ec28a949c834b7532d28db77a12648ecc959de2e) [9.012.04-2](https://github.com/xcp-ng-rpms/r8125-module/blob/09d284e6025bd29a9f2b4fcb365f049cf0d560df)   |   |  |  |
-| r8169-module  |    | [📜](https://github.com/xcp-ng-rpms/r8169-module/blob/8ece201548404ce0b1e4a2f92717e889d0c87487) [4.19.128-3](https://github.com/xcp-ng-rpms/r8169-module/blob/412de6275a68c24306f3e617ecee5625b38345d8)  |  |  |
-| sfc-module  |    | [📜](https://github.com/xcp-ng-rpms/sfc-module/blob/2f3fd6a457f4bd70ddd1f65b90d5bb2e0112614f) [5.3.18.1012-1](https://github.com/xcp-ng-rpms/sfc-module/blob/06a94d22797d36f7c0ae1c8ef68b8785b2416586) [💿](https://updates.xcp-ng.org/isos/drivers/8.x/sfc-module-alt-5.3.18.1012+1.xcpng8.3+pack.0.1.iso) |  |  |
-| tg3-module  |    | [📜](https://github.com/xcp-ng-rpms/tg3-module/blob/c621e390884e49af21e753e7672bc0042b08b49f) [3.139j-1](https://github.com/xcp-ng-rpms/tg3-module/blob/c259b7b1b9ef4821bb208ca47dfdefe652ffc52b)  |  |  |
+| r8169-module  |    | [📜](https://github.com/xcp-ng-rpms/r8169-module-alt/blob/8ece201548404ce0b1e4a2f92717e889d0c87487) [4.19.128-3](https://github.com/xcp-ng-rpms/r8169-module-alt/blob/412de6275a68c24306f3e617ecee5625b38345d8)  |  |  |
+| sfc-module  |    | [📜](https://github.com/xcp-ng-rpms/sfc-module-alt/blob/2f3fd6a457f4bd70ddd1f65b90d5bb2e0112614f) [5.3.18.1012-1](https://github.com/xcp-ng-rpms/sfc-module-alt/blob/06a94d22797d36f7c0ae1c8ef68b8785b2416586) [💿](https://updates.xcp-ng.org/isos/drivers/8.x/sfc-module-alt-5.3.18.1012+1.xcpng8.3+pack.0.1.iso) |  |  |
+| tg3-module  |    | [📜](https://github.com/xcp-ng-rpms/tg3-module-alt/blob/c621e390884e49af21e753e7672bc0042b08b49f) [3.139j-1](https://github.com/xcp-ng-rpms/tg3-module-alt/blob/c259b7b1b9ef4821bb208ca47dfdefe652ffc52b)  |  |  |
 
diff --git a/scripts/git-import-srpm b/scripts/git-import-srpm
index 765ba05..0245dc8 100755
--- a/scripts/git-import-srpm
+++ b/scripts/git-import-srpm
@@ -34,9 +34,15 @@ THIS_SCRIPT="$(readlink -f "$0")"
 
 SRPM_REPO_PATH=${SRPM_REPO_PATH:-${PWD}}
 PRODUCT="$(basename "${SRPM_REPO_PATH}/SPECS/"*.spec .spec)"
-OOT_DRIVER_IMPORT=${OOT_DRIVER_IMPORT:-}
-CODE_REPO_PATH="${CODE_REPO_PATH:-${SRPM_REPO_PATH}/../${PRODUCT/kernel/linux}/}"
 SPEC_FILE="SPECS/${PRODUCT}.spec"
+
+OOT_DRIVER_IMPORT=${OOT_DRIVER_IMPORT:-}
+if [[ -z "${OOT_DRIVER_IMPORT}" ]]; then
+    CODE_REPO_PATH="${CODE_REPO_PATH:-${SRPM_REPO_PATH}/../${PRODUCT/kernel/linux}/}"
+else
+    CODE_REPO_PATH="${CODE_REPO_PATH:-$(readlink -f "${SRPM_REPO_PATH}" | sed 's@/srpm/@/source/@')}"
+fi
+
 if [[ ${PRODUCT} = "kernel" || ${PRODUCT} = "qemu" ]]; then
     RELEASE_PREFIX="v"
 elif [[ ${PRODUCT} = "xen" ]]; then
@@ -55,6 +61,10 @@ fi
 
 GIT_COMMIT_OPTIONS="--no-gpg-sign"
 
+# GitHub runners may use a kernel version that makes rpmspec unhappy (e.g. "6.17.0-1010-azure"
+# contains a double separator). Define a known-good kernel version to avoid parse errors.
+RPM_OPTS=(--define 'kernel_version 4.19.0')
+
 function check_spec_file() {
     local worktree="$1"
     local revision="$2"
@@ -77,12 +87,12 @@ function get_build_dir() {
     local build_dirname_query_filter
     build_dirname_query_filter='%{name}-%{version}\n'
     if [[ $(git -C "${worktree}" show "${revision}:${SPEC_FILE}" | grep '^%autosetup' ) =~ [[:space:]]-n[[:space:]]+([^[:space:]]+) ]]; then
-	build_dirname_query_filter="${BASH_REMATCH[1]}"
+	build_dirname_query_filter="${BASH_REMATCH[1]}\n"
     fi
 
     local build_dirname
     build_dirname=$(git -C "${worktree}" show "${revision}:${SPEC_FILE}" | \
-			rpmspec --query --define "_topdir ${worktree}" --qf "${build_dirname_query_filter}" /dev/stdin | \
+			rpmspec --query --define "_topdir ${worktree}" "${RPM_OPTS[@]}" --qf "${build_dirname_query_filter}" /dev/stdin | \
 			awk 'NR == 1'
 		 )
 
@@ -106,7 +116,7 @@ function get_base_version() {
 
     check_spec_file "${worktree}" "${revision}"
 
-    git -C "${worktree}" show "${revision}:${SPEC_FILE}" | rpmspec -P /dev/stdin | awk "/^Version:/{print \"${RELEASE_PREFIX}\" \$NF \"${RELEASE_SUFFIX:-}\"}"
+    git -C "${worktree}" show "${revision}:${SPEC_FILE}" | rpmspec -P "${RPM_OPTS[@]}" /dev/stdin | awk "/^Version:/{print \"${RELEASE_PREFIX}\" \$NF \"${RELEASE_SUFFIX:-}\"}"
 }
 
 function get_release() {
@@ -115,7 +125,7 @@ function get_release() {
 
     check_spec_file "${worktree}" "${revision}"
 
-    git -C "${worktree}" show "${revision}:${SPEC_FILE}" | rpmspec -P /dev/stdin | awk '/^Release:/{print $NF}'
+    git -C "${worktree}" show "${revision}:${SPEC_FILE}" | rpmspec -P "${RPM_OPTS[@]}" /dev/stdin | awk '/^Release:/{print $NF}'
 }
 
 function get_full_version() {
@@ -250,7 +260,7 @@ function load_author_and_title() {
 function export_author() {
     export GIT_COMMITTER_NAME="Vates Git Importer"
     export GIT_COMMITTER_EMAIL="gitimporter@vates.tech"
-    export GIT_COMMITTER_DATE="1519512702"
+    export GIT_COMMITTER_DATE="1519512702 +0100"
 
     # These are simply default values in case the information is not
     # present inside the patch file - it allows idempotent runs as well.
@@ -303,7 +313,7 @@ function apply_patch() {
         fi
 
         # This one is used when we fallback to plain git commit
-        export GIT_AUTHOR_DATE="1442642982"
+        export GIT_AUTHOR_DATE="1442642982 +0100"
         if [[ -s ${git_dir}/rebase-apply/msg ]]; then
 
             load_author_and_title "${patch}" "${git_dir}"
@@ -429,6 +439,7 @@ rpmbuild --nodeps \
          --define "_buildshell /bin/bash" \
          --define "_topdir ${SRPM_REPO_WORKTREE}" \
          --define "_default_patch_fuzz 2" \
+         "${RPM_OPTS[@]}" \
          --eval "%{_default_patch_fuzz}" \
          -bp "${SRPM_REPO_WORKTREE}/${SPEC_FILE}" 2>> "${COMMAND_LOGS}" >> "${COMMAND_LOGS}" &
 RPMBUILD_PID=$!
diff --git a/scripts/update-drivers-list.sh b/scripts/update-drivers-list.sh
index 9b1c14d..7bea1a8 100755
--- a/scripts/update-drivers-list.sh
+++ b/scripts/update-drivers-list.sh
@@ -96,8 +96,8 @@ function generate_table() {
 	    normal="[📜](https://github.com/xcp-ng-rpms/$pkg/blob/$(git -C "$source_dir/$pkg" rev-parse HEAD)) $normal"
 	}
 	[ -n "$alt_raw" ] && {
-	    alt="[$alt_raw](https://github.com/xcp-ng-rpms/$pkg/blob/$(git -C "$srpm_dir/$pkg-alt" rev-parse HEAD))"
-	    alt="[📜](https://github.com/xcp-ng-rpms/$pkg/blob/$(git -C "$source_dir/$pkg-alt" rev-parse HEAD)) $alt"
+	    alt="[$alt_raw](https://github.com/xcp-ng-rpms/${pkg}-alt/blob/$(git -C "$srpm_dir/$pkg-alt" rev-parse HEAD))"
+	    alt="[📜](https://github.com/xcp-ng-rpms/${pkg}-alt/blob/$(git -C "$source_dir/$pkg-alt" rev-parse HEAD)) $alt"
 	}
 
         if [ -n "$normal_raw" ] && [ -n "$alt_raw" ] && [ "$normal_raw" != "$alt_raw" ]; then