diff --git a/.github/workflows/cleanbuild.yml b/.github/workflows/cleanbuild.yml
index 31a9eb844..851f35159 100644
--- a/.github/workflows/cleanbuild.yml
+++ b/.github/workflows/cleanbuild.yml
@@ -52,7 +52,11 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: |
+          sudo gem install apt-spy2 -v 0.7.2
+          sudo apt-spy2 check
+          sudo apt-spy2 fix --commit
+          sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
 
       - name: Workaround for tar not being able to access /var/cache/apt/archives
         run: |
diff --git a/.github/workflows/depsbuild.yml b/.github/workflows/depsbuild.yml
index 9854e5964..a7e861063 100644
--- a/.github/workflows/depsbuild.yml
+++ b/.github/workflows/depsbuild.yml
@@ -52,7 +52,11 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: |
+          sudo gem install apt-spy2 -v 0.7.2
+          sudo apt-spy2 check
+          sudo apt-spy2 fix --commit
+          sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
 
       - name: Workaround for tar not being able to access /var/cache/apt/archives
         run: |
diff --git a/.github/workflows/functesting.yml b/.github/workflows/functesting.yml
index b8dea6c38..0ce6c32ea 100644
--- a/.github/workflows/functesting.yml
+++ b/.github/workflows/functesting.yml
@@ -48,7 +48,11 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: |
+          sudo gem install apt-spy2 -v 0.7.2
+          sudo apt-spy2 check
+          sudo apt-spy2 fix --commit
+          sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
 
       - name: Get Date
         id: get-date
diff --git a/.github/workflows/glitching.yml b/.github/workflows/glitching.yml
index cdbc05363..c760c3fad 100644
--- a/.github/workflows/glitching.yml
+++ b/.github/workflows/glitching.yml
@@ -37,7 +37,11 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: |
+          sudo gem install apt-spy2 -v 0.7.2
+          sudo apt-spy2 check
+          sudo apt-spy2 fix --commit
+          sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
 
       - name: Get Date
         id: get-date