diff --git a/.gitattributes b/.gitattributes
index 549fc36f25..f30b4ca9e1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,7 @@
 # Git itself
 .gitattributes eol=lf
 .gitignore eol=lf
-OWNERS eol=lf
+.github/CODEOWNERS eol=lf
 
 # dnscontrol files are unix line-endings:
 *.md text eol=lf
diff --git a/OWNERS b/.github/CODEOWNERS
similarity index 99%
rename from OWNERS
rename to .github/CODEOWNERS
index 3732c3b683..74ec57d495 100644
--- a/OWNERS
+++ b/.github/CODEOWNERS
@@ -56,3 +56,5 @@ providers/sakuracloud @ttkzw
 providers/transip @blackshadev
 providers/vercel @SukkaW
 providers/vultr @pgaskin
+
+* @tlimoncelli
diff --git a/build/generate/ownersFile.go b/build/generate/ownersFile.go
index a3e2ebf38a..983e8d84bf 100644
--- a/build/generate/ownersFile.go
+++ b/build/generate/ownersFile.go
@@ -25,7 +25,11 @@ func generateOwnersFile() error {
 		ownersData.WriteString("\n")
 	}
 
-	file, err := os.Create("OWNERS")
+	// Overall maintainer
+	ownersData.WriteString("\n")
+	ownersData.WriteString("* @tlimoncelli\n")
+
+	file, err := os.Create(".github/CODEOWNERS")
 	if err != nil {
 		return err
 	}
diff --git a/documentation/advanced-features/writing-providers.md b/documentation/advanced-features/writing-providers.md
index c0da36b840..22306f13ab 100644
--- a/documentation/advanced-features/writing-providers.md
+++ b/documentation/advanced-features/writing-providers.md
@@ -354,7 +354,7 @@ These are the things we'll be checking when you submit the PR.  Please try to co
 
 1. Run `go generate ./...` to make sure all generated files are fresh.
 2. Make sure the following files were created and/or updated:
-  * `OWNERS`
+  * `CODEOWNERS`
   * `README.md`
   * `.github/workflows/pr_integration_tests.yml` (The PROVIDERS list)
   * `.goreleaser.yml` (Search for `Provider-specific changes`)