diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 823d7171ca..c375960451 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -147,12 +147,13 @@ jobs:
 
   test-go-fips:
     name: Run Go tests with FIPS configuration
-    # Only run this job for the enterprise repo if the PR is not docs/ui only
+    # Only run fips on the enterprise repo, and only if it's main or a release branch
+    # (i.e. not a PR), or is a PR with the label "fips"
     if: |
-      github.event.pull_request.draft == false &&
       needs.setup.outputs.enterprise == 1 &&
       needs.verify-changes.outputs.is_docs_change == 'false' &&
-      needs.verify-changes.outputs.is_ui_change == 'false'
+      needs.verify-changes.outputs.is_ui_change == 'false' && 
+      (contains(github.event.pull_request.labels.*.name, 'fips') || github.ref_name == 'main' || startsWith(github.ref_name, 'release/'))
     needs:
       - setup
       - verify-changes