diff --git a/master_sync.toml b/master_sync.toml
index f84b85e..68bb05b 100644
--- a/master_sync.toml
+++ b/master_sync.toml
@@ -14,14 +14,6 @@ enabled = true
 
 ##
 
-[[server]]
-name = "Unraid_New"
-[server.config]
-external_address = "HTTP://172.24.3.12"
-enabled = true
-
-##
-
 [[stack]]
 name = "automation"
 [stack.config]
@@ -29,7 +21,9 @@ server = "Unraid_New"
 auto_update = true
 linked_repo = "compose-automation"
 env_file_path = "n8n.env"
-additional_env_files = ["n8n.env"]
+additional_env_files = [
+  { path = "n8n.env", track = true }
+]
 
 ##
 
@@ -52,7 +46,9 @@ server = "Unraid_New"
 auto_update = true
 linked_repo = "compose-dashboards"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["timezone.env"]
+additional_env_files = [
+  { path = "timezone.env", track = true }
+]
 
 ##
 
@@ -64,7 +60,9 @@ server = "Unraid_New"
 auto_pull = false
 linked_repo = "compose-grimmory"
 env_file_path = "grimmory.env"
-additional_env_files = ["grimmory.env"]
+additional_env_files = [
+  { path = "grimmory.env", track = true }
+]
 environment = """
 # Application
 APP_USER_ID=1000
@@ -214,7 +212,10 @@ server = "Unraid_New"
 auto_update = true
 linked_repo = "compose-immich"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["immich.env", "immich-frame.env"]
+additional_env_files = [
+  { path = "immich.env", track = true },
+  { path = "immich-frame.env", track = true }
+]
 
 ##
 
@@ -296,7 +297,9 @@ project_name = "media_apps"
 auto_update = true
 linked_repo = "compose-Media_Apps"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["karakeep.env"]
+additional_env_files = [
+  { path = "karakeep.env", track = true }
+]
 environment = """
   # VARIABLE = value
 """
@@ -311,7 +314,9 @@ server = "Unraid_New"
 auto_update = true
 linked_repo = "compose-obsidian-sync"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["andrew-obsidian-vault.env"]
+additional_env_files = [
+  { path = "andrew-obsidian-vault.env", track = true }
+]
 
 ##
 
@@ -334,7 +339,9 @@ server = "Unraid_New"
 auto_update = true
 linked_repo = "compose-paperless-ngx"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["stack.env"]
+additional_env_files = [
+  { path = "stack.env", track = true }
+]
 
 ##
 
@@ -378,7 +385,9 @@ server = "Unraid_New"
 auto_update = true
 linked_repo = "compose-servarr"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["timezone.env"]
+additional_env_files = [
+  { path = "timezone.env", track = true }
+]
 
 ##
 
@@ -419,7 +428,9 @@ project_name = "uptime-kuma"
 auto_update = true
 linked_repo = "compose-uptime-kuma"
 webhook_secret = "Spotting-Drainpipe-Freely-Outwit-Opponent7"
-additional_env_files = ["uptime.env"]
+additional_env_files = [
+  { path = "uptime.env", track = true }
+]
 ignore_services = ["signal-cli-rest-api"]
 
 ##
@@ -858,6 +869,16 @@ branch = "master"
 
 ##
 
+[[repo]]
+name = "master-config"
+[repo.config]
+git_provider = "gitea:3000"
+git_https = false
+git_account = "andrewamason"
+repo = "andrewamason/resources"
+
+##
+
 [[repo]]
 name = "swag"
 [repo.config]
@@ -880,6 +901,51 @@ branch = "master"
 
 ##
 
+[[procedure]]
+name = "Backup Core Database"
+description = "Triggers the Core database backup at the scheduled time."
+tags = ["system"]
+config.schedule = "Every day at 01:00"
+
+[[procedure.config.stage]]
+name = "Stage 1"
+enabled = true
+executions = [
+  { execution.type = "BackupCoreDatabase", execution.params = {}, enabled = true }
+]
+
+##
+
+[[procedure]]
+name = "Global Auto Update"
+description = "Pulls and auto updates Stacks and Deployments using 'poll_for_updates' or 'auto_update'."
+tags = ["system"]
+config.schedule = "Every day at 03:00"
+
+[[procedure.config.stage]]
+name = "Stage 1"
+enabled = true
+executions = [
+  { execution.type = "GlobalAutoUpdate", execution.params.skip_auto_update = false, enabled = true }
+]
+
+##
+
+[[procedure]]
+name = "Rotate Server Keys"
+description = "Rotates all currently connected Server keys."
+tags = ["system"]
+config.schedule = "Every day at 06:00"
+
+[[procedure.config.stage]]
+name = "Stage 1"
+enabled = true
+executions = [
+  { execution.type = "RotateAllServerKeys", execution.params = {}, enabled = true }
+]
+
+##
+
 [[action]]
 name = "Global Auto Update"
 [action.config]
@@ -897,6 +963,14 @@ await komodo.execute('GlobalAutoUpdate', {server: "Unraid_New"});
 
 ##
 
+[[builder]]
+name = "Local"
+[builder.config]
+type = "Server"
+params = {}
+
+##
+
 [[builder]]
 name = "local"
 [builder.config]
@@ -919,17 +993,4 @@ name = "Master Resource Sync"
 linked_repo = "Master_Resource_Sync"
 resource_path = ["master_sync.toml"]
 managed = true
-delete = true
-
-[[procedure]]
-name = "Backup Core Database"
-description = "Triggers the Core database backup at the scheduled time."
-tags = ["system"]
-config.schedule = "Every day at 01:00"
-
-[[procedure.config.stage]]
-name = "Stage 1"
-enabled = true
-executions = [
-  { execution.type = "BackupCoreDatabase", execution.params = {}, enabled = true }
-]
\ No newline at end of file
+delete = true
\ No newline at end of file