diff --git a/.golangci.yml b/.golangci.yml
index 505a33161..14827cfe6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -89,4 +89,4 @@ linters-settings:
 run:
   timeout: 10m
   concurrency: 4
-  skip-dirs-use-default: false
+  skip-dirs-use-default: false
\ No newline at end of file
diff --git a/.release/ci.hcl b/.release/ci.hcl
index e7f62f837..c5cb5b96f 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -5,14 +5,17 @@ schema = "1"
 
 project "consul-template" {
   // the team key is not used by CRT currently
-  team = "cat-floss"
+  team = "consul-core"
   slack {
-    notification_channel = "C026W707YHJ"
+    notification_channel = "C9KPKPKRN"
   }
   github {
     organization = "hashicorp"
     repository = "consul-template"
-    release_branches = ["main"]
+    release_branches = [
+      "main",
+      "release/**",
+    ]
   }
 }
 
diff --git a/Dockerfile b/Dockerfile
index 5933eff2b..1fb571213 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ ARG PRODUCT_NAME=$BIN_NAME
 # TARGETARCH and TARGETOS are set automatically when --platform is provided.
 ARG TARGETOS TARGETARCH
 
-LABEL maintainer="John Eikenberry <jae@zhar.net>"
+LABEL maintainer="Consul Team <consul@hashicorp.com>"
 # version label is required for build process
 LABEL version=$PRODUCT_VERSION
 LABEL revision=$PRODUCT_REVISION
diff --git a/Makefile b/Makefile
index 3fc605330..6f31f9226 100644
--- a/Makefile
+++ b/Makefile
@@ -72,3 +72,9 @@ toc:
 dev-tree:
 	@true
 .PHONY: dev-tree
+
+# lint
+lint:
+	@echo "==> Running golangci-lint"
+	GOWORK=off golangci-lint run --build-tags '$(GOTAGS)'
+.PHONY: lint
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 096b9dec5..7aee91ad8 100644
--- a/go.mod
+++ b/go.mod
@@ -68,7 +68,3 @@ require (
 	golang.org/x/time v0.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422
-
-replace sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.5.1