diff --git a/.mk/state_mount.mk b/.mk/state_mount.mk
deleted file mode 100644
index 7ef8bd2..0000000
--- a/.mk/state_mount.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: state/mount
-state/mount:
-	@mkdir -p state
-	@sshfs u393136@u393136.your-storagebox.de:/terraform ./state -o ssh_command="sshpass -p $(shell pass storagebox) ssh"
diff --git a/.mk/state_umount.mk b/.mk/state_umount.mk
deleted file mode 100644
index e1e9c21..0000000
--- a/.mk/state_umount.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: state/umount
-state/umount:
-	@umount ./state
-	@rm -rf ./state
diff --git a/github/opsheaven/repositories/terraform-modules.yaml b/github/opsheaven/repositories/terraform-modules.yaml
index 941d1b4..efe7fe9 100644
--- a/github/opsheaven/repositories/terraform-modules.yaml
+++ b/github/opsheaven/repositories/terraform-modules.yaml
@@ -29,9 +29,9 @@ terraform-github-organisation:
   status_checks:
     - 'pre-commit'
 
-terraform-hetzner-zone:
+terraform-hetzner-hetzner-zone:
   description: 'OpsHeaven''s Terraform module to manage Hetzner DNS Zones.'
-  homepage_url: 'https://registry.terraform.io/modules/opsheaven/zone/hetzner'
+  homepage_url: 'https://registry.terraform.io/modules/opsheaven/zone/hetzner-zone'
   visibility: 'public'
   has_issues: true
   has_downloads: false
diff --git a/github/opsheaven/terragrunt.hcl b/github/opsheaven/terragrunt.hcl
index 71ff753..f5b1acd 100644
--- a/github/opsheaven/terragrunt.hcl
+++ b/github/opsheaven/terragrunt.hcl
@@ -17,3 +17,26 @@ inputs = merge(
     )
   }
 )
+
+generate "moved" {
+  path      = "moved.tf"
+  if_exists = "overwrite"
+  contents  = <<EOT
+  moved {
+    from = github_branch_default.main["terraform-hetzner-zone"]
+    to = github_branch_default.main["terraform-hetzner-hetzner-zone"]
+  }
+  moved {
+    from =  github_repository.this["terraform-hetzner-zone"]
+    to =  github_repository.this["terraform-hetzner-hetzner-zone"]
+  }
+  moved {
+    from = github_repository_collaborators.this["terraform-hetzner-zone"]
+    to =github_repository_collaborators.this["terraform-hetzner-hetzner-zone"]
+  }
+  moved {
+    from = github_branch_protection.this["terraform-hetzner-zone"]
+    to =github_branch_protection.this["terraform-hetzner-hetzner-zone"]
+  }
+EOT
+}