diff --git a/.github/workflows/bosh-release-checks.yaml b/.github/workflows/bosh-release-checks.yaml
index bb6a139e58..1048639cc8 100644
--- a/.github/workflows/bosh-release-checks.yaml
+++ b/.github/workflows/bosh-release-checks.yaml
@@ -46,7 +46,7 @@ jobs:
         run: |
           set -e
           export PATH=$PATH:/usr/local/maven/bin
-          make mod-tidy vendor db scheduler
+          make go-mod-tidy vendor db scheduler
 
       - name: Build Dev Release
         id: build
diff --git a/.github/workflows/dependency-update.go-mod-tidy_and_make-package-specs.yaml b/.github/workflows/dependency-update.go-mod-tidy_and_make-package-specs.yaml
index 3b3b4e54cb..cf32bf2cf8 100644
--- a/.github/workflows/dependency-update.go-mod-tidy_and_make-package-specs.yaml
+++ b/.github/workflows/dependency-update.go-mod-tidy_and_make-package-specs.yaml
@@ -62,11 +62,14 @@ jobs:
             exit 0
           fi
 
+          # Generated files are needed for `go mod tidy` which is a dependency of the
+          # target `package-specs`. However the generation of them itself already
+          # requires go-modules to be tidied up. So we need to generate the files
+          # before changing `go.mod` and `go.sum`.
           declare -r current_branch="$(git branch --show-current)"
           git checkout 'HEAD~1'
-          pushd './src/acceptance/assets/app/go_app'
-            make generate
-          popd
+          make --directory='./src/acceptance/assets/app/go_app' generate-fakes
+          make --directory='./src/autoscaler' generate-fakes
           git checkout "${current_branch}"
 
           make package-specs
diff --git a/.github/workflows/tidy-go-mod.yaml b/.github/workflows/tidy-go-mod.yaml
index 6bf8f7b984..ed1c27c028 100644
--- a/.github/workflows/tidy-go-mod.yaml
+++ b/.github/workflows/tidy-go-mod.yaml
@@ -19,7 +19,7 @@ jobs:
         run: git config --global --add safe.directory "${GITHUB_WORKSPACE}"
 
       - name: run go mod tidy on all .mod's
-        run: make mod-tidy
+        run: make go-mod-tidy
 
       - name: Check if there is any change
         id: get_changes