diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d0b6992..48533935 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.15
       - name: Ensure packages and dependencies compile
@@ -22,7 +22,12 @@ jobs:
         run: go test ./...
       - name: Ensure autogenerated protos match checked-in protos
         run: make checkproto
+  golangci:
+    if: startsWith(github.repository, 'spinnaker/')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
       - name: Ensure code formatting and style is consistent
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.27
+          version: v1.31
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f26afc43..84b0f7d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: 1.15
       - name: Create release