diff --git a/modules/plain-repo/files/renovate.json b/modules/plain-repo/files/renovate.json
index 3abc98a..135e2fc 100644
--- a/modules/plain-repo/files/renovate.json
+++ b/modules/plain-repo/files/renovate.json
@@ -4,6 +4,7 @@
     "config:recommended"
   ],
   "prConcurrentLimit": 1,
+  "rebaseWhen": "conflicted",
   "packageRules": [
     {
       "matchManagers": ["github-actions"],
diff --git a/modules/plain-repo/repo-files.tf b/modules/plain-repo/repo-files.tf
deleted file mode 100644
index 157fa54..0000000
--- a/modules/plain-repo/repo-files.tf
+++ /dev/null
@@ -1,8 +0,0 @@
-resource "github_repository_file" "renovate-json" {
-  count               = var.repo_type == "terraform_module" ? 1 : 0
-  repository          = github_repository.repo.name
-  file                = "renovate.json"
-  content             = file("${path.module}/files/renovate.json")
-  commit_message      = "Configure renovate"
-  overwrite_on_create = true
-}
diff --git a/modules/plain-repo/repos-files.tf b/modules/plain-repo/repos-files.tf
index 0ba1dbc..0a4c740 100755
--- a/modules/plain-repo/repos-files.tf
+++ b/modules/plain-repo/repos-files.tf
@@ -1,7 +1,18 @@
 locals {
   vuln_scanner_workflow = var.public_repo ? "vuln-scanner-pr-public.yml" : "vuln-scanner-pr-private.yml"
+}
 
+resource "github_repository_file" "renovate_json" {
+  depends_on = [
+    github_repository_ruleset.main
+  ]
+  repository          = github_repository.repo.name
+  file                = "renovate.json"
+  content             = file("${path.module}/files/renovate.json")
+  commit_message      = "Configure renovate"
+  overwrite_on_create = true
 }
+
 resource "github_repository_file" "vuln_scanner_workflow" {
   depends_on = [
     github_repository_ruleset.main