diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce74a173..09513a48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   from certificate requests in certificate templates (smallstep/crypto#767)
 - Allow to specify audience when generating JWK provisioner tokens (smallstep/certificates#2326)
 - Add SSH certificate type to exposed metrics (smallstep/certificates#2290)
+- Enable dynamic validation of project ownership within a GCP organization
+  when using the GCP Cloud Instance Identity provisioner (smallstep/certificates#2133)
 
 ### Changed
 
diff --git a/scripts/badger-migration/main.go b/scripts/badger-migration/main.go
index 4e978cb3..fed4b7cd 100644
--- a/scripts/badger-migration/main.go
+++ b/scripts/badger-migration/main.go
@@ -60,7 +60,6 @@ type dryRunDB struct{}
 
 func (*dryRunDB) CreateTable([]byte) error { return nil }
 
-//nolint:revive // allow unused parameters to show function signature
 func (*dryRunDB) Set(bucket, key, value []byte) error { return nil }
 
 func usage(fs *flag.FlagSet) {
diff --git a/test/integration/scep/internal/x509/oid.go b/test/integration/scep/internal/x509/oid.go
index 1fbd29e4..e1e10e40 100644
--- a/test/integration/scep/internal/x509/oid.go
+++ b/test/integration/scep/internal/x509/oid.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//nolint:staticcheck,revive,gocritic // code copied from crypto/x509
+//nolint:staticcheck,gocritic // code copied from crypto/x509
 package legacyx509
 
 import (
@@ -18,9 +18,7 @@ import (
 	"github.com/smallstep/certificates/internal/cast"
 )
 
-var (
-	errInvalidOID = errors.New("invalid oid")
-)
+var errInvalidOID = errors.New("invalid oid")
 
 // An OID represents an ASN.1 OBJECT IDENTIFIER.
 type OID struct {
diff --git a/test/integration/scep/internal/x509/parser.go b/test/integration/scep/internal/x509/parser.go
index a674deae..c8944da8 100644
--- a/test/integration/scep/internal/x509/parser.go
+++ b/test/integration/scep/internal/x509/parser.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//nolint:revive,gocritic,errorlint,unconvert,staticcheck // code copied from crypto/x509
+//nolint:gocritic,errorlint,unconvert,staticcheck // code copied from crypto/x509
 package legacyx509
 
 import (