diff --git a/.github/workflows/cleanbuild.yml b/.github/workflows/cleanbuild.yml
index 31a9eb844..1f01efaa2 100644
--- a/.github/workflows/cleanbuild.yml
+++ b/.github/workflows/cleanbuild.yml
@@ -23,6 +23,7 @@ jobs:
     env:
       COMPILER: ${{ matrix.compiler }}
       TAR_CMD: tar_nosuid
+      GHA_OS: ${{ matrix.os }}
 
     strategy:
       matrix:
@@ -52,7 +53,7 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: scripts/ft-apt-get-update.sh
 
       - 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..fde4a0544 100644
--- a/.github/workflows/depsbuild.yml
+++ b/.github/workflows/depsbuild.yml
@@ -23,6 +23,7 @@ jobs:
     env:
       COMPILER: ${{ matrix.compiler }}
       TAR_CMD: tar_nosuid
+      GHA_OS: ${{ matrix.os }}
 
     strategy:
       matrix:
@@ -52,7 +53,7 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: scripts/ft-apt-get-update.sh
 
       - 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..1641955e9 100644
--- a/.github/workflows/functesting.yml
+++ b/.github/workflows/functesting.yml
@@ -23,6 +23,7 @@ jobs:
     env:
       COMPILER: ${{ matrix.compiler }}
       TAR_CMD: tar_nosuid
+      GHA_OS: ${{ matrix.os }}
 
     strategy:
       matrix:
@@ -48,7 +49,7 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: scripts/ft-apt-get-update.sh
 
       - name: Get Date
         id: get-date
diff --git a/.github/workflows/glitching.yml b/.github/workflows/glitching.yml
index cdbc05363..2ff3033df 100644
--- a/.github/workflows/glitching.yml
+++ b/.github/workflows/glitching.yml
@@ -23,6 +23,7 @@ jobs:
     env:
       COMPILER: ${{ matrix.compiler }}
       TAR_CMD: tar_nosuid
+      GHA_OS: ${{ matrix.os }}
 
     strategy:
       matrix:
@@ -37,7 +38,7 @@ jobs:
           submodules: 'recursive'
 
       - name: apt_get_update
-        run: sudo -H DEBIAN_FRONTEND=noninteractive apt-get update
+        run: scripts/ft-apt-get-update.sh
 
       - name: Get Date
         id: get-date
diff --git a/scripts/ft-apt-get-update.sh b/scripts/ft-apt-get-update.sh
new file mode 100755
index 000000000..7398cfbad
--- /dev/null
+++ b/scripts/ft-apt-get-update.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "${GHA_OS}" == "ubuntu-18.04" ]
+then
+  sudo gem install apt-spy2 -v 0.7.2
+else
+  sudo gem install apt-spy2
+fi
+sudo apt-spy2 check
+sudo apt-spy2 fix --commit
+sudo -H DEBIAN_FRONTEND=noninteractive apt-get update