diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8856c9bc..769e62acf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -99,9 +99,8 @@ jobs:
       - name: Lint
         env:
           GOLANGCI_LINT_CACHE: ${{ steps.go_cache.outputs.analysis_cache }}
-          SKIP_LINTER_ANALYSIS: false
-          RUN_BUILDTAGGER: true
-          GOGC: "50"
+          SKIP_LINTER_ANALYSIS: true
+          RUN_BUILDTAGGER: false
         run: make lint
 
   check-diff:
diff --git a/Makefile b/Makefile
index 56370f5e6..3cd582a7d 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,15 @@ GO_REQUIRED_VERSION ?= 1.21
 # Uncomment below if you need to override the version.
 # GOLANGCILINT_VERSION ?= 1.54.0
 
+RUN_BUILDTAGGER ?= false
+# if RUN_BUILDTAGGER is set to "true", we will use build constraints
+# and use the buildtagger tool to generate the build tags.
+ifeq ($(RUN_BUILDTAGGER),true)
+GO_LINT_ARGS ?= -v --build-tags all
+BUILDTAGGER_VERSION ?= v0.12.0-rc.0.28.gdc5d6f3
+BUILDTAGGER_DOWNLOAD_URL ?= https://s3.us-west-2.amazonaws.com/upbound.official-providers-ci.releases/main/$(BUILDTAGGER_VERSION)/bin/$(SAFEHOST_PLATFORM)/buildtagger
+endif
+
 # SUBPACKAGES ?= $(shell find cmd/provider -type d -maxdepth 1 -mindepth 1 | cut -d/ -f3)
 SUBPACKAGES ?= monolith
 GO_STATIC_PACKAGES ?= $(GO_PROJECT)/cmd/generator ${SUBPACKAGES:%=$(GO_PROJECT)/cmd/provider/%}
diff --git a/scripts/tag.sh b/scripts/tag.sh
old mode 100644
new mode 100755