diff --git a/.circleci/config.yml b/.circleci/config.yml
index 006b6954b5e4c..d7a89e7c8b9f3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -73,6 +73,12 @@ restoreGoModCache: &restoreGoModCache
     keys:
       - *goModCacheKey
 
+goModTidy: &goModTidy
+  run:
+    name: Ensure all go modules are present
+    command: go mod tidy
+    when: always
+
 saveGoModCache: &saveGoModCache
   save_cache:
     name: Saving Go module cache
@@ -903,6 +909,11 @@ commands:
               cci-export GOTAGS release
             fi
 
+  restore-go-mod-cache:
+    steps:
+      - *restoreGoModCache
+      - *goModTidy
+
   setup-dep-env:
     parameters:
       docker-login:
@@ -2069,7 +2080,7 @@ commands:
           run-on-master: true
           run-on-tags: true
           changed-path-ignore: "^ui/"
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
       - *restoreGoBuildCache
 
@@ -2223,7 +2234,7 @@ jobs:
     steps:
       - checkout
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
       - *restoreGradle
       - restore-npm-deps-cache
@@ -2261,7 +2272,7 @@ jobs:
     resource_class: medium
     steps:
       - checkout
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
       - run:
           no_output_timeout: 30m
@@ -2310,7 +2321,7 @@ jobs:
     steps:
       - checkout
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
 
       - run:
@@ -2349,7 +2360,7 @@ jobs:
             fi
 
       - checkout
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
 
       - run:
@@ -2374,7 +2385,7 @@ jobs:
       resource_class: large
     steps:
       - checkout
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
 
       - *restoreGoBuildCache
@@ -2611,7 +2622,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: /go/src/github.com/stackrox/rox
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
       - *restoreGoBuildCache
       - run:
@@ -2742,7 +2753,7 @@ jobs:
 
       - install-ossls
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
 
       - run:
@@ -2859,7 +2870,7 @@ jobs:
 
       - install-ossls
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
 
       - restore-npm-deps-cache
@@ -2929,7 +2940,7 @@ jobs:
       - attach_workspace:
           at: /go/src/github.com/stackrox/rox
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
 
       - run:
@@ -3051,7 +3062,7 @@ jobs:
 
       - *refreshAlpineBaseImage
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
       - *restoreGoBuildCache
 
@@ -3457,7 +3468,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: /go/src/github.com/stackrox/rox
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - *setupRoxctl
       - run:
           name: Run standalone roxctl Bats tests
@@ -3498,7 +3509,7 @@ jobs:
       - attach_workspace:
           at: /go/src/github.com/stackrox/rox
 
-      - *restoreGoModCache
+      - restore-go-mod-cache
       - setup-go-build-env
       - run:
           name: Retrieving missing dependencies