diff --git a/tools/addon/actual-budget-prometheus-exporter.sh b/tools/addon/actual-budget-prometheus-exporter.sh
index 15e335008..476ae2274 100644
--- a/tools/addon/actual-budget-prometheus-exporter.sh
+++ b/tools/addon/actual-budget-prometheus-exporter.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "actual-budget-prometheus-exporter" "addon"
 
 # Enable error handling
diff --git a/tools/addon/add-netbird-lxc.sh b/tools/addon/add-netbird-lxc.sh
index 643c735ec..9fc8a08d4 100644
--- a/tools/addon/add-netbird-lxc.sh
+++ b/tools/addon/add-netbird-lxc.sh
@@ -19,10 +19,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "add-netbird-lxc" "addon"
 
 # Enable error handling
@@ -98,8 +98,8 @@ fi
 apt-get install -y ca-certificates gpg &>/dev/null
 
 # Reuse the shared repository helper instead of hand-rolling the sources entry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
 load_functions
 
 # Drop the legacy keyring from the pre-deb822 layout
diff --git a/tools/addon/add-tailscale-lxc.sh b/tools/addon/add-tailscale-lxc.sh
index 59de79a62..8549b7b16 100644
--- a/tools/addon/add-tailscale-lxc.sh
+++ b/tools/addon/add-tailscale-lxc.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "add-tailscale-lxc" "addon"
 
 # Enable error handling
@@ -143,8 +143,8 @@ else
   fi
 
   # Reuse the shared repository helper instead of hand-rolling the sources entry
-  source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-  source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
+  source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+  source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
   load_functions
 
   # Drop the legacy keyring from the pre-deb822 layout
diff --git a/tools/addon/adguardhome-sync.sh b/tools/addon/adguardhome-sync.sh
index 66b65b81a..1cc9290aa 100644
--- a/tools/addon/adguardhome-sync.sh
+++ b/tools/addon/adguardhome-sync.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "adguardhome-sync" "addon"
 
 # Enable error handling
diff --git a/tools/addon/all-templates.sh b/tools/addon/all-templates.sh
index e7ecebae7..ecc1a4cb4 100644
--- a/tools/addon/all-templates.sh
+++ b/tools/addon/all-templates.sh
@@ -17,10 +17,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "all-templates" "addon"
 
 # Enable error handling; destroy any partially-created container before reporting the error
diff --git a/tools/addon/arcane.sh b/tools/addon/arcane.sh
index dbfe4b5ee..bb0cabac5 100644
--- a/tools/addon/arcane.sh
+++ b/tools/addon/arcane.sh
@@ -14,10 +14,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "arcane" "addon"
 
 # Enable error handling
diff --git a/tools/addon/coder-code-server.sh b/tools/addon/coder-code-server.sh
index b75bc36a4..35eb55e7d 100644
--- a/tools/addon/coder-code-server.sh
+++ b/tools/addon/coder-code-server.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "coder-code-server" "addon"
 
 # Enable error handling
diff --git a/tools/addon/coolify.sh b/tools/addon/coolify.sh
index fd70e9080..6fe199c75 100644
--- a/tools/addon/coolify.sh
+++ b/tools/addon/coolify.sh
@@ -14,10 +14,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "coolify" "addon"
 
 # Enable error handling
diff --git a/tools/addon/copyparty.sh b/tools/addon/copyparty.sh
index afa1b0dd9..26126ba5f 100644
--- a/tools/addon/copyparty.sh
+++ b/tools/addon/copyparty.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "copyparty" "addon"
 
 # Enable error handling
diff --git a/tools/addon/cronmaster.sh b/tools/addon/cronmaster.sh
index 7d8e30747..a868bda3b 100644
--- a/tools/addon/cronmaster.sh
+++ b/tools/addon/cronmaster.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "cronmaster" "addon"
 
 # Enable error handling
diff --git a/tools/addon/crowdsec.sh b/tools/addon/crowdsec.sh
index 905385d28..b32f97c31 100644
--- a/tools/addon/crowdsec.sh
+++ b/tools/addon/crowdsec.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "crowdsec" "addon"
 
 # Enable error handling
diff --git a/tools/addon/dockge.sh b/tools/addon/dockge.sh
index 52042a352..4083d6c70 100644
--- a/tools/addon/dockge.sh
+++ b/tools/addon/dockge.sh
@@ -14,10 +14,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "dockge" "addon"
 
 # Enable error handling
diff --git a/tools/addon/dokploy.sh b/tools/addon/dokploy.sh
index 7cf493308..ec4cb9beb 100644
--- a/tools/addon/dokploy.sh
+++ b/tools/addon/dokploy.sh
@@ -14,10 +14,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "dokploy" "addon"
 
 # Enable error handling
diff --git a/tools/addon/filebrowser-quantum.sh b/tools/addon/filebrowser-quantum.sh
index 5c4dcbb4d..e71d833a5 100644
--- a/tools/addon/filebrowser-quantum.sh
+++ b/tools/addon/filebrowser-quantum.sh
@@ -22,10 +22,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "filebrowser-quantum" "addon"
 
 # Enable error handling
diff --git a/tools/addon/filebrowser.sh b/tools/addon/filebrowser.sh
index 743330e47..03a818aaa 100644
--- a/tools/addon/filebrowser.sh
+++ b/tools/addon/filebrowser.sh
@@ -21,10 +21,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "filebrowser" "addon"
 
 # Enable error handling
diff --git a/tools/addon/glances.sh b/tools/addon/glances.sh
index 842457a84..9cb864f18 100644
--- a/tools/addon/glances.sh
+++ b/tools/addon/glances.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "glances" "addon"
 
 # Enable error handling
diff --git a/tools/addon/homebrew.sh b/tools/addon/homebrew.sh
index 77e1f134f..e4e4e5fa0 100644
--- a/tools/addon/homebrew.sh
+++ b/tools/addon/homebrew.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 
 # Enable error handling
 set -Eeuo pipefail
diff --git a/tools/addon/immich-public-proxy.sh b/tools/addon/immich-public-proxy.sh
index 4981dfdb1..4a6178239 100644
--- a/tools/addon/immich-public-proxy.sh
+++ b/tools/addon/immich-public-proxy.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "immich-public-proxy" "addon"
 
 # Enable error handling
diff --git a/tools/addon/jellystat.sh b/tools/addon/jellystat.sh
index f9c97d759..ceb9dd992 100644
--- a/tools/addon/jellystat.sh
+++ b/tools/addon/jellystat.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "jellystat" "addon"
 
 # Enable error handling
diff --git a/tools/addon/komodo.sh b/tools/addon/komodo.sh
index 8b41ed268..0dbb244d1 100644
--- a/tools/addon/komodo.sh
+++ b/tools/addon/komodo.sh
@@ -14,10 +14,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "komodo" "addon"
 
 # Enable error handling
diff --git a/tools/addon/netdata.sh b/tools/addon/netdata.sh
index 7e04ff0b9..9420bc5ec 100644
--- a/tools/addon/netdata.sh
+++ b/tools/addon/netdata.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "netdata" "addon"
 
 # Enable error handling
diff --git a/tools/addon/nextcloud-exporter.sh b/tools/addon/nextcloud-exporter.sh
index b3617122e..6f476768d 100644
--- a/tools/addon/nextcloud-exporter.sh
+++ b/tools/addon/nextcloud-exporter.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "nextcloud-exporter" "addon"
 
 # Enable error handling
diff --git a/tools/addon/olivetin.sh b/tools/addon/olivetin.sh
index 86f182f58..f68d9cb8a 100644
--- a/tools/addon/olivetin.sh
+++ b/tools/addon/olivetin.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "olivetin" "addon"
 
 # Enable error handling
diff --git a/tools/addon/phpmyadmin.sh b/tools/addon/phpmyadmin.sh
index dfcb2cd22..3355c7e44 100644
--- a/tools/addon/phpmyadmin.sh
+++ b/tools/addon/phpmyadmin.sh
@@ -20,10 +20,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "phpmyadmin" "addon"
 
 # Enable error handling
diff --git a/tools/addon/pihole-exporter.sh b/tools/addon/pihole-exporter.sh
index 4fbef1d94..305667b4b 100644
--- a/tools/addon/pihole-exporter.sh
+++ b/tools/addon/pihole-exporter.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pihole-exporter" "addon"
 
 # Enable error handling
diff --git a/tools/addon/portainer.sh b/tools/addon/portainer.sh
index da9acc116..f0fd832af 100644
--- a/tools/addon/portainer.sh
+++ b/tools/addon/portainer.sh
@@ -9,10 +9,10 @@ if ! command -v curl &>/dev/null; then
   apt-get update >/dev/null 2>&1
   apt-get install -y curl >/dev/null 2>&1
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "portainer" "addon"
 
 # Enable error handling
diff --git a/tools/addon/prometheus-paperless-ngx-exporter.sh b/tools/addon/prometheus-paperless-ngx-exporter.sh
index b77a7a73a..42b3a85d5 100644
--- a/tools/addon/prometheus-paperless-ngx-exporter.sh
+++ b/tools/addon/prometheus-paperless-ngx-exporter.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "prometheus-paperless-ngx-exporter" "addon"
 
 # Enable error handling
diff --git a/tools/addon/pyenv.sh b/tools/addon/pyenv.sh
index 51e32eedf..95a64b336 100644
--- a/tools/addon/pyenv.sh
+++ b/tools/addon/pyenv.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pyenv" "addon"
 
 # Enable error handling
diff --git a/tools/addon/qbittorrent-exporter.sh b/tools/addon/qbittorrent-exporter.sh
index 17af8ce08..90b7048d1 100644
--- a/tools/addon/qbittorrent-exporter.sh
+++ b/tools/addon/qbittorrent-exporter.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "qbittorrent-exporter" "addon"
 
 # Enable error handling
diff --git a/tools/addon/runtipi.sh b/tools/addon/runtipi.sh
index 0f291f13c..c208fff0f 100644
--- a/tools/addon/runtipi.sh
+++ b/tools/addon/runtipi.sh
@@ -14,10 +14,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "runtipi" "addon"
 
 # Enable error handling
diff --git a/tools/addon/sparkyfitness-garmin.sh b/tools/addon/sparkyfitness-garmin.sh
index 6fc4a4322..aa865bd57 100644
--- a/tools/addon/sparkyfitness-garmin.sh
+++ b/tools/addon/sparkyfitness-garmin.sh
@@ -15,10 +15,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "sparkyfitness-garmin" "addon"
 
 # Enable error handling
diff --git a/tools/addon/webmin.sh b/tools/addon/webmin.sh
index 376969e3d..efcd7af25 100644
--- a/tools/addon/webmin.sh
+++ b/tools/addon/webmin.sh
@@ -18,10 +18,10 @@ if ! command -v curl &>/dev/null; then
     apt-get install -y curl >/dev/null 2>&1
   fi
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/lib/tools.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "webmin" "addon"
 
 # Enable error handling
diff --git a/tools/headers/actual-budget-prometheus-exporter b/tools/headers/actual-budget-prometheus-exporter
deleted file mode 100644
index 7a08b62cd..000000000
--- a/tools/headers/actual-budget-prometheus-exporter
+++ /dev/null
@@ -1,6 +0,0 @@
-              __              __      __              __           __                                        __  __                                                     __           
-  ____ ______/ /___  ______ _/ /     / /_  __  ______/ /___ ____  / /_      ____  _________  ____ ___  ___  / /_/ /_  ___  __  _______      ___  _  ______  ____  _____/ /____  _____
- / __ `/ ___/ __/ / / / __ `/ /_____/ __ \/ / / / __  / __ `/ _ \/ __/_____/ __ \/ ___/ __ \/ __ `__ \/ _ \/ __/ __ \/ _ \/ / / / ___/_____/ _ \| |/_/ __ \/ __ \/ ___/ __/ _ \/ ___/
-/ /_/ / /__/ /_/ /_/ / /_/ / /_____/ /_/ / /_/ / /_/ / /_/ /  __/ /_/_____/ /_/ / /  / /_/ / / / / / /  __/ /_/ / / /  __/ /_/ (__  )_____/  __/>  </ /_/ / /_/ / /  / /_/  __/ /    
-\__,_/\___/\__/\__,_/\__,_/_/     /_.___/\__,_/\__,_/\__, /\___/\__/     / .___/_/   \____/_/ /_/ /_/\___/\__/_/ /_/\___/\__,_/____/      \___/_/|_/ .___/\____/_/   \__/\___/_/     
-                                                    /____/              /_/                                                                       /_/                                
diff --git a/tools/headers/add-netbird-lxc b/tools/headers/add-netbird-lxc
deleted file mode 100644
index cec4ea626..000000000
--- a/tools/headers/add-netbird-lxc
+++ /dev/null
@@ -1,6 +0,0 @@
-             __    __                 __  __    _          __      __         
-  ____ _____/ /___/ /     ____  ___  / /_/ /_  (_)________/ /     / /  _______
- / __ `/ __  / __  /_____/ __ \/ _ \/ __/ __ \/ / ___/ __  /_____/ / |/_/ ___/
-/ /_/ / /_/ / /_/ /_____/ / / /  __/ /_/ /_/ / / /  / /_/ /_____/ />  </ /__  
-\__,_/\__,_/\__,_/     /_/ /_/\___/\__/_.___/_/_/   \__,_/     /_/_/|_|\___/  
-                                                                              
diff --git a/tools/headers/add-tailscale-lxc b/tools/headers/add-tailscale-lxc
deleted file mode 100644
index 3bdb2143b..000000000
--- a/tools/headers/add-tailscale-lxc
+++ /dev/null
@@ -1,6 +0,0 @@
-             __    __      __        _ __                __           __         
-  ____ _____/ /___/ /     / /_____ _(_) /_____________ _/ /__        / /  _______
- / __ `/ __  / __  /_____/ __/ __ `/ / / ___/ ___/ __ `/ / _ \______/ / |/_/ ___/
-/ /_/ / /_/ / /_/ /_____/ /_/ /_/ / / (__  ) /__/ /_/ / /  __/_____/ />  </ /__  
-\__,_/\__,_/\__,_/      \__/\__,_/_/_/____/\___/\__,_/_/\___/     /_/_/|_|\___/  
-                                                                                 
diff --git a/tools/headers/adguardhome-sync b/tools/headers/adguardhome-sync
deleted file mode 100644
index 00b5677d5..000000000
--- a/tools/headers/adguardhome-sync
+++ /dev/null
@@ -1,6 +0,0 @@
-    ___       ________                     ____  __                          _____                 
-   /   | ____/ / ____/_  ______ __________/ / / / /___  ____ ___  ___       / ___/__  ______  _____
-  / /| |/ __  / / __/ / / / __ `/ ___/ __  / /_/ / __ \/ __ `__ \/ _ \______\__ \/ / / / __ \/ ___/
- / ___ / /_/ / /_/ / /_/ / /_/ / /  / /_/ / __  / /_/ / / / / / /  __/_____/__/ / /_/ / / / / /__  
-/_/  |_\__,_/\____/\__,_/\__,_/_/   \__,_/_/ /_/\____/_/ /_/ /_/\___/     /____/\__, /_/ /_/\___/  
-                                                                               /____/              
diff --git a/tools/headers/all-templates b/tools/headers/all-templates
deleted file mode 100644
index 7c8214370..000000000
--- a/tools/headers/all-templates
+++ /dev/null
@@ -1,6 +0,0 @@
-         ____      __                       __      __           
-  ____ _/ / /     / /____  ____ ___  ____  / /___ _/ /____  _____
- / __ `/ / /_____/ __/ _ \/ __ `__ \/ __ \/ / __ `/ __/ _ \/ ___/
-/ /_/ / / /_____/ /_/  __/ / / / / / /_/ / / /_/ / /_/  __(__  ) 
-\__,_/_/_/      \__/\___/_/ /_/ /_/ .___/_/\__,_/\__/\___/____/  
-                                 /_/                             
diff --git a/tools/headers/arcane b/tools/headers/arcane
deleted file mode 100644
index 825613762..000000000
--- a/tools/headers/arcane
+++ /dev/null
@@ -1,6 +0,0 @@
-    ___                             
-   /   |  ______________ _____  ___ 
-  / /| | / ___/ ___/ __ `/ __ \/ _ \
- / ___ |/ /  / /__/ /_/ / / / /  __/
-/_/  |_/_/   \___/\__,_/_/ /_/\___/ 
-                                    
diff --git a/tools/headers/codercodeserver b/tools/headers/codercodeserver
deleted file mode 100644
index 791718820..000000000
--- a/tools/headers/codercodeserver
+++ /dev/null
@@ -1,6 +0,0 @@
-   ______          __             ______          __        _____                          
-  / ____/___  ____/ /__  _____   / ____/___  ____/ /__     / ___/___  ______   _____  _____
- / /   / __ \/ __  / _ \/ ___/  / /   / __ \/ __  / _ \    \__ \/ _ \/ ___/ | / / _ \/ ___/
-/ /___/ /_/ / /_/ /  __/ /     / /___/ /_/ / /_/ /  __/   ___/ /  __/ /   | |/ /  __/ /    
-\____/\____/\__,_/\___/_/      \____/\____/\__,_/\___/   /____/\___/_/    |___/\___/_/     
-                                                                                           
diff --git a/tools/headers/coolify b/tools/headers/coolify
deleted file mode 100644
index b6cfab616..000000000
--- a/tools/headers/coolify
+++ /dev/null
@@ -1,6 +0,0 @@
-   ______            ___ ____     
-  / ____/___  ____  / (_) __/_  __
- / /   / __ \/ __ \/ / / /_/ / / /
-/ /___/ /_/ / /_/ / / / __/ /_/ / 
-\____/\____/\____/_/_/_/  \__, /  
-                         /____/   
diff --git a/tools/headers/copyparty b/tools/headers/copyparty
deleted file mode 100644
index 7e072248d..000000000
--- a/tools/headers/copyparty
+++ /dev/null
@@ -1,6 +0,0 @@
-   ______                  ____             __       
-  / ____/___  ____  __  __/ __ \____ ______/ /___  __
- / /   / __ \/ __ \/ / / / /_/ / __ `/ ___/ __/ / / /
-/ /___/ /_/ / /_/ / /_/ / ____/ /_/ / /  / /_/ /_/ / 
-\____/\____/ .___/\__, /_/    \__,_/_/   \__/\__, /  
-          /_/    /____/                     /____/   
diff --git a/tools/headers/cronmaster b/tools/headers/cronmaster
deleted file mode 100644
index 60daa252c..000000000
--- a/tools/headers/cronmaster
+++ /dev/null
@@ -1,6 +0,0 @@
-   ______                 __  ___           __           
-  / ____/________  ____  /  |/  /___ ______/ /____  _____
- / /   / ___/ __ \/ __ \/ /|_/ / __ `/ ___/ __/ _ \/ ___/
-/ /___/ /  / /_/ / / / / /  / / /_/ (__  ) /_/  __/ /    
-\____/_/   \____/_/ /_/_/  /_/\__,_/____/\__/\___/_/     
-                                                         
diff --git a/tools/headers/crowdsec b/tools/headers/crowdsec
deleted file mode 100644
index 383cacbc2..000000000
--- a/tools/headers/crowdsec
+++ /dev/null
@@ -1,6 +0,0 @@
-   ______                       _______          
-  / ____/________ _      ______/ / ___/___  _____
- / /   / ___/ __ \ | /| / / __  /\__ \/ _ \/ ___/
-/ /___/ /  / /_/ / |/ |/ / /_/ /___/ /  __/ /__  
-\____/_/   \____/|__/|__/\__,_//____/\___/\___/  
-                                                 
diff --git a/tools/headers/dockge b/tools/headers/dockge
deleted file mode 100644
index 040b66ac8..000000000
--- a/tools/headers/dockge
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____             __            
-   / __ \____  _____/ /______ ____ 
-  / / / / __ \/ ___/ //_/ __ `/ _ \
- / /_/ / /_/ / /__/ ,< / /_/ /  __/
-/_____/\____/\___/_/|_|\__, /\___/ 
-                      /____/       
diff --git a/tools/headers/dockhand b/tools/headers/dockhand
deleted file mode 100644
index 456affbcb..000000000
--- a/tools/headers/dockhand
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____             __   __                    __
-   / __ \____  _____/ /__/ /_  ____ _____  ____/ /
-  / / / / __ \/ ___/ //_/ __ \/ __ `/ __ \/ __  / 
- / /_/ / /_/ / /__/ ,< / / / / /_/ / / / / /_/ /  
-/_____/\____/\___/_/|_/_/ /_/\__,_/_/ /_/\__,_/   
-                                                  
diff --git a/tools/headers/dokploy b/tools/headers/dokploy
deleted file mode 100644
index 62d93ae53..000000000
--- a/tools/headers/dokploy
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____        __         __           
-   / __ \____  / /______  / /___  __  __
-  / / / / __ \/ //_/ __ \/ / __ \/ / / /
- / /_/ / /_/ / ,< / /_/ / / /_/ / /_/ / 
-/_____/\____/_/|_/ .___/_/\____/\__, /  
-                /_/            /____/   
diff --git a/tools/headers/filebrowser b/tools/headers/filebrowser
deleted file mode 100644
index 1f4b71a1a..000000000
--- a/tools/headers/filebrowser
+++ /dev/null
@@ -1,6 +0,0 @@
-    _______ __     ____                                   
-   / ____(_) /__  / __ )_________ _      __________  _____
-  / /_  / / / _ \/ __  / ___/ __ \ | /| / / ___/ _ \/ ___/
- / __/ / / /  __/ /_/ / /  / /_/ / |/ |/ (__  )  __/ /    
-/_/   /_/_/\___/_____/_/   \____/|__/|__/____/\___/_/     
-                                                          
diff --git a/tools/headers/filebrowserquantum b/tools/headers/filebrowserquantum
deleted file mode 100644
index 95c8b4b87..000000000
--- a/tools/headers/filebrowserquantum
+++ /dev/null
@@ -1,6 +0,0 @@
-    _______ __     ____                                       ____                    __                
-   / ____(_) /__  / __ )_________ _      __________  _____   / __ \__  ______ _____  / /___  ______ ___ 
-  / /_  / / / _ \/ __  / ___/ __ \ | /| / / ___/ _ \/ ___/  / / / / / / / __ `/ __ \/ __/ / / / __ `__ \
- / __/ / / /  __/ /_/ / /  / /_/ / |/ |/ (__  )  __/ /     / /_/ / /_/ / /_/ / / / / /_/ /_/ / / / / / /
-/_/   /_/_/\___/_____/_/   \____/|__/|__/____/\___/_/      \___\_\__,_/\__,_/_/ /_/\__/\__,_/_/ /_/ /_/ 
-                                                                                                        
diff --git a/tools/headers/glances b/tools/headers/glances
deleted file mode 100644
index 18ac97577..000000000
--- a/tools/headers/glances
+++ /dev/null
@@ -1,6 +0,0 @@
-   ________                          
-  / ____/ /___ _____  ________  _____
- / / __/ / __ `/ __ \/ ___/ _ \/ ___/
-/ /_/ / / /_/ / / / / /__/  __(__  ) 
-\____/_/\__,_/_/ /_/\___/\___/____/  
-                                     
diff --git a/tools/headers/homeassistantcontainer b/tools/headers/homeassistantcontainer
deleted file mode 100644
index dd7d0def1..000000000
--- a/tools/headers/homeassistantcontainer
+++ /dev/null
@@ -1,6 +0,0 @@
-    __  __                        ___              _      __              __     ______            __        _                
-   / / / /___  ____ ___  ___     /   |  __________(_)____/ /_____ _____  / /_   / ____/___  ____  / /_____ _(_)___  ___  _____
-  / /_/ / __ \/ __ `__ \/ _ \   / /| | / ___/ ___/ / ___/ __/ __ `/ __ \/ __/  / /   / __ \/ __ \/ __/ __ `/ / __ \/ _ \/ ___/
- / __  / /_/ / / / / / /  __/  / ___ |(__  |__  ) (__  ) /_/ /_/ / / / / /_   / /___/ /_/ / / / / /_/ /_/ / / / / /  __/ /    
-/_/ /_/\____/_/ /_/ /_/\___/  /_/  |_/____/____/_/____/\__/\__,_/_/ /_/\__/   \____/\____/_/ /_/\__/\__,_/_/_/ /_/\___/_/     
-                                                                                                                              
diff --git a/tools/headers/homeassistantcore b/tools/headers/homeassistantcore
deleted file mode 100644
index d356da026..000000000
--- a/tools/headers/homeassistantcore
+++ /dev/null
@@ -1,6 +0,0 @@
-    __  __                        ___              _      __              __     ______              
-   / / / /___  ____ ___  ___     /   |  __________(_)____/ /_____ _____  / /_   / ____/___  ________ 
-  / /_/ / __ \/ __ `__ \/ _ \   / /| | / ___/ ___/ / ___/ __/ __ `/ __ \/ __/  / /   / __ \/ ___/ _ \
- / __  / /_/ / / / / / /  __/  / ___ |(__  |__  ) (__  ) /_/ /_/ / / / / /_   / /___/ /_/ / /  /  __/
-/_/ /_/\____/_/ /_/ /_/\___/  /_/  |_/____/____/_/____/\__/\__,_/_/ /_/\__/   \____/\____/_/   \___/ 
-                                                                                                     
diff --git a/tools/headers/homebrew b/tools/headers/homebrew
deleted file mode 100644
index 529ede91c..000000000
--- a/tools/headers/homebrew
+++ /dev/null
@@ -1,6 +0,0 @@
-    __                         __                     
-   / /_  ____  ____ ___  ___  / /_  ________ _      __
-  / __ \/ __ \/ __ `__ \/ _ \/ __ \/ ___/ _ \ | /| / /
- / / / / /_/ / / / / / /  __/ /_/ / /  /  __/ |/ |/ / 
-/_/ /_/\____/_/ /_/ /_/\___/_.___/_/   \___/|__/|__/  
-                                                      
diff --git a/tools/headers/immichpublicproxy b/tools/headers/immichpublicproxy
deleted file mode 100644
index 3a2195356..000000000
--- a/tools/headers/immichpublicproxy
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____                    _      __       ____        __    ___         ____                       
-   /  _/___ ___  ____ ___  (_)____/ /_     / __ \__  __/ /_  / (_)____   / __ \_________  _  ____  __
-   / // __ `__ \/ __ `__ \/ / ___/ __ \   / /_/ / / / / __ \/ / / ___/  / /_/ / ___/ __ \| |/_/ / / /
- _/ // / / / / / / / / / / / /__/ / / /  / ____/ /_/ / /_/ / / / /__   / ____/ /  / /_/ />  </ /_/ / 
-/___/_/ /_/ /_/_/ /_/ /_/_/\___/_/ /_/  /_/    \__,_/_.___/_/_/\___/  /_/   /_/   \____/_/|_|\__, /  
-                                                                                            /____/   
diff --git a/tools/headers/ip-tag b/tools/headers/ip-tag
deleted file mode 100644
index 153ccd369..000000000
--- a/tools/headers/ip-tag
+++ /dev/null
@@ -1,6 +0,0 @@
-    ________      ______           
-   /  _/ __ \    /_  __/___ _____ _
-   / // /_/ /_____/ / / __ `/ __ `/
- _/ // ____/_____/ / / /_/ / /_/ / 
-/___/_/         /_/  \__,_/\__, /  
-                          /____/   
diff --git a/tools/headers/jellystat b/tools/headers/jellystat
deleted file mode 100644
index e8176a5e2..000000000
--- a/tools/headers/jellystat
+++ /dev/null
@@ -1,6 +0,0 @@
-       __     ____           __        __ 
-      / /__  / / /_  _______/ /_____ _/ /_
- __  / / _ \/ / / / / / ___/ __/ __ `/ __/
-/ /_/ /  __/ / / /_/ (__  ) /_/ /_/ / /_  
-\____/\___/_/_/\__, /____/\__/\__,_/\__/  
-              /____/                      
diff --git a/tools/headers/komodo b/tools/headers/komodo
deleted file mode 100644
index 06d2e9350..000000000
--- a/tools/headers/komodo
+++ /dev/null
@@ -1,6 +0,0 @@
-    __ __                          __    
-   / //_/___  ____ ___  ____  ____/ /___ 
-  / ,< / __ \/ __ `__ \/ __ \/ __  / __ \
- / /| / /_/ / / / / / / /_/ / /_/ / /_/ /
-/_/ |_\____/_/ /_/ /_/\____/\__,_/\____/ 
-                                         
diff --git a/tools/headers/netdata b/tools/headers/netdata
deleted file mode 100644
index ad7dc9234..000000000
--- a/tools/headers/netdata
+++ /dev/null
@@ -1,6 +0,0 @@
-    _   __     __      __      __       
-   / | / /__  / /_____/ /___ _/ /_____ _
-  /  |/ / _ \/ __/ __  / __ `/ __/ __ `/
- / /|  /  __/ /_/ /_/ / /_/ / /_/ /_/ / 
-/_/ |_/\___/\__/\__,_/\__,_/\__/\__,_/  
-                                        
diff --git a/tools/headers/nextcloud-exporter b/tools/headers/nextcloud-exporter
deleted file mode 100644
index bf698dbac..000000000
--- a/tools/headers/nextcloud-exporter
+++ /dev/null
@@ -1,6 +0,0 @@
-                    __       __                __                                 __           
-   ____  ___  _  __/ /______/ /___  __  ______/ /     ___  _  ______  ____  _____/ /____  _____
-  / __ \/ _ \| |/_/ __/ ___/ / __ \/ / / / __  /_____/ _ \| |/_/ __ \/ __ \/ ___/ __/ _ \/ ___/
- / / / /  __/>  </ /_/ /__/ / /_/ / /_/ / /_/ /_____/  __/>  </ /_/ / /_/ / /  / /_/  __/ /    
-/_/ /_/\___/_/|_|\__/\___/_/\____/\__,_/\__,_/      \___/_/|_/ .___/\____/_/   \__/\___/_/     
-                                                            /_/                                
diff --git a/tools/headers/olivetin b/tools/headers/olivetin
deleted file mode 100644
index 3c55122ef..000000000
--- a/tools/headers/olivetin
+++ /dev/null
@@ -1,6 +0,0 @@
-   ____  ___          _______     
-  / __ \/ (_)   _____/_  __(_)___ 
- / / / / / / | / / _ \/ / / / __ \
-/ /_/ / / /| |/ /  __/ / / / / / /
-\____/_/_/ |___/\___/_/ /_/_/ /_/ 
-                                  
diff --git a/tools/headers/phpmyadmin b/tools/headers/phpmyadmin
deleted file mode 100644
index 8c2a6117b..000000000
--- a/tools/headers/phpmyadmin
+++ /dev/null
@@ -1,6 +0,0 @@
-           __          __  ___      ___       __          _     
-    ____  / /_  ____  /  |/  /_  __/   | ____/ /___ ___  (_)___ 
-   / __ \/ __ \/ __ \/ /|_/ / / / / /| |/ __  / __ `__ \/ / __ \
-  / /_/ / / / / /_/ / /  / / /_/ / ___ / /_/ / / / / / / / / / /
- / .___/_/ /_/ .___/_/  /_/\__, /_/  |_\__,_/_/ /_/ /_/_/_/ /_/ 
-/_/         /_/           /____/                                
diff --git a/tools/headers/pihole-exporter b/tools/headers/pihole-exporter
deleted file mode 100644
index 162d8a390..000000000
--- a/tools/headers/pihole-exporter
+++ /dev/null
@@ -1,6 +0,0 @@
-           _ __          __                                      __           
-    ____  (_) /_  ____  / /__        ___  _  ______  ____  _____/ /____  _____
-   / __ \/ / __ \/ __ \/ / _ \______/ _ \| |/_/ __ \/ __ \/ ___/ __/ _ \/ ___/
-  / /_/ / / / / / /_/ / /  __/_____/  __/>  </ /_/ / /_/ / /  / /_/  __/ /    
- / .___/_/_/ /_/\____/_/\___/      \___/_/|_/ .___/\____/_/   \__/\___/_/     
-/_/                                        /_/                                
diff --git a/tools/headers/portainer b/tools/headers/portainer
deleted file mode 100644
index 7efd9f4a7..000000000
--- a/tools/headers/portainer
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____             __        _                
-   / __ \____  _____/ /_____ _(_)___  ___  _____
-  / /_/ / __ \/ ___/ __/ __ `/ / __ \/ _ \/ ___/
- / ____/ /_/ / /  / /_/ /_/ / / / / /  __/ /    
-/_/    \____/_/   \__/\__,_/_/_/ /_/\___/_/     
-                                                
diff --git a/tools/headers/prometheus-paperless-ngx-exporter b/tools/headers/prometheus-paperless-ngx-exporter
deleted file mode 100644
index 833e1dc26..000000000
--- a/tools/headers/prometheus-paperless-ngx-exporter
+++ /dev/null
@@ -1,6 +0,0 @@
-                                     __  __                                                      __                                                                       __           
-    ____  _________  ____ ___  ___  / /_/ /_  ___  __  _______      ____  ____ _____  ___  _____/ /__  __________      ____  ____ __  __      ___  _  ______  ____  _____/ /____  _____
-   / __ \/ ___/ __ \/ __ `__ \/ _ \/ __/ __ \/ _ \/ / / / ___/_____/ __ \/ __ `/ __ \/ _ \/ ___/ / _ \/ ___/ ___/_____/ __ \/ __ `/ |/_/_____/ _ \| |/_/ __ \/ __ \/ ___/ __/ _ \/ ___/
-  / /_/ / /  / /_/ / / / / / /  __/ /_/ / / /  __/ /_/ (__  )_____/ /_/ / /_/ / /_/ /  __/ /  / /  __(__  |__  )_____/ / / / /_/ />  </_____/  __/>  </ /_/ / /_/ / /  / /_/  __/ /    
- / .___/_/   \____/_/ /_/ /_/\___/\__/_/ /_/\___/\__,_/____/     / .___/\__,_/ .___/\___/_/  /_/\___/____/____/     /_/ /_/\__, /_/|_|      \___/_/|_/ .___/\____/_/   \__/\___/_/     
-/_/                                                             /_/         /_/                                           /____/                    /_/                                
diff --git a/tools/headers/pve-privilege-converter b/tools/headers/pve-privilege-converter
deleted file mode 100644
index 47d0c3657..000000000
--- a/tools/headers/pve-privilege-converter
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____ _    ________     ____       _       _ __                      ______                           __           
-   / __ \ |  / / ____/    / __ \_____(_)   __(_) /__  ____ ____        / ____/___  ____ _   _____  _____/ /____  _____
-  / /_/ / | / / __/______/ /_/ / ___/ / | / / / / _ \/ __ `/ _ \______/ /   / __ \/ __ \ | / / _ \/ ___/ __/ _ \/ ___/
- / ____/| |/ / /__/_____/ ____/ /  / /| |/ / / /  __/ /_/ /  __/_____/ /___/ /_/ / / / / |/ /  __/ /  / /_/  __/ /    
-/_/     |___/_____/    /_/   /_/  /_/ |___/_/_/\___/\__, /\___/      \____/\____/_/ /_/|___/\___/_/   \__/\___/_/     
-                                                   /____/                                                             
diff --git a/tools/headers/pyenv b/tools/headers/pyenv
deleted file mode 100644
index a70ad94be..000000000
--- a/tools/headers/pyenv
+++ /dev/null
@@ -1,6 +0,0 @@
-                                
-    ____  __  _____  ____ _   __
-   / __ \/ / / / _ \/ __ \ | / /
-  / /_/ / /_/ /  __/ / / / |/ / 
- / .___/\__, /\___/_/ /_/|___/  
-/_/    /____/                   
diff --git a/tools/headers/qbittorrent-exporter b/tools/headers/qbittorrent-exporter
deleted file mode 100644
index 07677b261..000000000
--- a/tools/headers/qbittorrent-exporter
+++ /dev/null
@@ -1,6 +0,0 @@
-         __    _ __  __                             __                                   __           
-  ____ _/ /_  (_) /_/ /_____  _____________  ____  / /_      ___  _  ______  ____  _____/ /____  _____
- / __ `/ __ \/ / __/ __/ __ \/ ___/ ___/ _ \/ __ \/ __/_____/ _ \| |/_/ __ \/ __ \/ ___/ __/ _ \/ ___/
-/ /_/ / /_/ / / /_/ /_/ /_/ / /  / /  /  __/ / / / /_/_____/  __/>  </ /_/ / /_/ / /  / /_/  __/ /    
-\__, /_.___/_/\__/\__/\____/_/  /_/   \___/_/ /_/\__/      \___/_/|_/ .___/\____/_/   \__/\___/_/     
-  /_/                                                              /_/                                
diff --git a/tools/headers/runtipi b/tools/headers/runtipi
deleted file mode 100644
index 263474d18..000000000
--- a/tools/headers/runtipi
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____              __  _       _ 
-   / __ \__  ______  / /_(_)___  (_)
-  / /_/ / / / / __ \/ __/ / __ \/ / 
- / _, _/ /_/ / / / / /_/ / /_/ / /  
-/_/ |_|\__,_/_/ /_/\__/_/ .___/_/   
-                       /_/          
diff --git a/tools/headers/sparkyfitness-garmin b/tools/headers/sparkyfitness-garmin
deleted file mode 100644
index 3fb871853..000000000
--- a/tools/headers/sparkyfitness-garmin
+++ /dev/null
@@ -1,6 +0,0 @@
-   _____                  __         _______ __                             ______                     _     
-  / ___/____  ____ ______/ /____  __/ ____(_) /_____  ___  __________      / ____/___ __________ ___  (_)___ 
-  \__ \/ __ \/ __ `/ ___/ //_/ / / / /_  / / __/ __ \/ _ \/ ___/ ___/_____/ / __/ __ `/ ___/ __ `__ \/ / __ \
- ___/ / /_/ / /_/ / /  / ,< / /_/ / __/ / / /_/ / / /  __(__  |__  )_____/ /_/ / /_/ / /  / / / / / / / / / /
-/____/ .___/\__,_/_/  /_/|_|\__, /_/   /_/\__/_/ /_/\___/____/____/      \____/\__,_/_/  /_/ /_/ /_/_/_/ /_/ 
-    /_/                    /____/                                                                            
diff --git a/tools/headers/webmin b/tools/headers/webmin
deleted file mode 100644
index f2306990f..000000000
--- a/tools/headers/webmin
+++ /dev/null
@@ -1,6 +0,0 @@
- _       __     __              _     
-| |     / /__  / /_  ____ ___  (_)___ 
-| | /| / / _ \/ __ \/ __ `__ \/ / __ \
-| |/ |/ /  __/ /_/ / / / / / / / / / /
-|__/|__/\___/_.___/_/ /_/ /_/_/_/ /_/ 
-                                      
diff --git a/tools/pve/add-iptag.sh b/tools/pve/add-iptag.sh
index a2714f52f..8ddc9ba70 100644
--- a/tools/pve/add-iptag.sh
+++ b/tools/pve/add-iptag.sh
@@ -32,7 +32,7 @@ CM="${GN}✓${CL} "
 CROSS="${RD}✗${CL} "
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "add-iptag" "pve"
 
 # Stop any running spinner
diff --git a/tools/pve/clean-lxcs.sh b/tools/pve/clean-lxcs.sh
index a4a9567e1..e54a307a9 100644
--- a/tools/pve/clean-lxcs.sh
+++ b/tools/pve/clean-lxcs.sh
@@ -24,7 +24,7 @@ GN="\033[1;92m"
 CL="\033[m"
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "clean-lxcs" "pve"
 
 header_info
diff --git a/tools/pve/clean-orphaned-lvm.sh b/tools/pve/clean-orphaned-lvm.sh
index 8d1df7a12..18548a37a 100644
--- a/tools/pve/clean-orphaned-lvm.sh
+++ b/tools/pve/clean-orphaned-lvm.sh
@@ -17,7 +17,7 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "clean-orphaned-lvm" "pve"
 
 # Function to check for orphaned LVM volumes
diff --git a/tools/pve/container-restore-from-backup.sh b/tools/pve/container-restore-from-backup.sh
index c73d51c7d..0669a95a1 100644
--- a/tools/pve/container-restore-from-backup.sh
+++ b/tools/pve/container-restore-from-backup.sh
@@ -45,7 +45,7 @@ EOF
 header_info
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "container-restore" "pve"
 
 function msg_info() {
diff --git a/tools/pve/core-restore-from-backup.sh b/tools/pve/core-restore-from-backup.sh
index 276b7e122..d3520e11b 100644
--- a/tools/pve/core-restore-from-backup.sh
+++ b/tools/pve/core-restore-from-backup.sh
@@ -45,7 +45,7 @@ EOF
 header_info
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "core-restore" "pve"
 
 function msg_info() {
diff --git a/tools/pve/disk-health.sh b/tools/pve/disk-health.sh
index 49f50a296..fa12746ae 100755
--- a/tools/pve/disk-health.sh
+++ b/tools/pve/disk-health.sh
@@ -5,8 +5,8 @@
 # License: MIT
 # https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/refs/heads/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 load_functions
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "disk-health" "pve"
 
diff --git a/tools/pve/execute.sh b/tools/pve/execute.sh
index 1ffbcc57d..41e4dcacf 100644
--- a/tools/pve/execute.sh
+++ b/tools/pve/execute.sh
@@ -24,7 +24,7 @@ GN=$(echo "\033[1;92m")
 CL=$(echo "\033[m")
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "execute-lxcs" "pve"
 
 header_info
diff --git a/tools/pve/frigate-support.sh b/tools/pve/frigate-support.sh
index 1616b9cfb..3f3a79f24 100644
--- a/tools/pve/frigate-support.sh
+++ b/tools/pve/frigate-support.sh
@@ -17,7 +17,7 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "frigate-support" "pve"
 
 header_info
diff --git a/tools/pve/fstrim.sh b/tools/pve/fstrim.sh
index 8540aa457..b63b4267c 100644
--- a/tools/pve/fstrim.sh
+++ b/tools/pve/fstrim.sh
@@ -20,7 +20,7 @@ GN="\033[1;92m"
 CL="\033[m"
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "fstrim" "pve"
 
 LOGFILE="/var/log/fstrim.log"
diff --git a/tools/pve/guest-delete.sh b/tools/pve/guest-delete.sh
index 6ee0c9b15..139f1e6f6 100644
--- a/tools/pve/guest-delete.sh
+++ b/tools/pve/guest-delete.sh
@@ -39,7 +39,7 @@ TAB="  "
 CM="${TAB}✔️${TAB}${CL}"
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "guest-delete" "pve"
 
 GUEST_LOG=$(mktemp)
diff --git a/tools/pve/host-backup.sh b/tools/pve/host-backup.sh
index 5509dd4c6..4a579cd1c 100644
--- a/tools/pve/host-backup.sh
+++ b/tools/pve/host-backup.sh
@@ -17,7 +17,7 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "host-backup" "pve"
 
 # Function to perform backup
diff --git a/tools/pve/hw-acceleration.sh b/tools/pve/hw-acceleration.sh
index d983157be..950a44028 100644
--- a/tools/pve/hw-acceleration.sh
+++ b/tools/pve/hw-acceleration.sh
@@ -31,7 +31,7 @@ CM="${GN}✓${CL}"
 set -e
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "hw-acceleration" "pve"
 
 header_info
diff --git a/tools/pve/kernel-clean.sh b/tools/pve/kernel-clean.sh
index 1fba4576d..98351a487 100644
--- a/tools/pve/kernel-clean.sh
+++ b/tools/pve/kernel-clean.sh
@@ -23,7 +23,7 @@ RD="\033[01;31m"
 CL="\033[m"
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "kernel-clean" "pve"
 
 # Detect current kernel
diff --git a/tools/pve/kernel-pin.sh b/tools/pve/kernel-pin.sh
index 95ca34f35..11622eb38 100644
--- a/tools/pve/kernel-pin.sh
+++ b/tools/pve/kernel-pin.sh
@@ -27,7 +27,7 @@ current_kernel=$(uname -r)
 available_kernels=$(dpkg --list | grep 'kernel-.*-pve' | awk '{print substr($2, 16, length($2)-22)}')
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "kernel-pin" "pve"
 
 header_info
diff --git a/tools/pve/microcode.sh b/tools/pve/microcode.sh
index f3a2e95a6..b4a3541a0 100644
--- a/tools/pve/microcode.sh
+++ b/tools/pve/microcode.sh
@@ -30,7 +30,7 @@ msg_ok() { echo -e "${BFR} ${CM} ${GN}$1${CL}"; }
 msg_error() { echo -e "${BFR} ${CROSS} ${RD}$1${CL}"; }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "microcode" "pve"
 
 header_info
diff --git a/tools/pve/monitor-all.sh b/tools/pve/monitor-all.sh
index 477265f36..650c86a8b 100644
--- a/tools/pve/monitor-all.sh
+++ b/tools/pve/monitor-all.sh
@@ -16,7 +16,7 @@ cat <<"EOF"
 EOF
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "monitor-all" "pve"
 
 add() {
diff --git a/tools/pve/nic-offloading-fix.sh b/tools/pve/nic-offloading-fix.sh
index ef630e536..2320c0d06 100644
--- a/tools/pve/nic-offloading-fix.sh
+++ b/tools/pve/nic-offloading-fix.sh
@@ -34,7 +34,7 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "nic-offloading-fix" "pve"
 
 header_info
diff --git a/tools/pve/pbs-microcode.sh b/tools/pve/pbs-microcode.sh
index 7df879fca..58c3106ff 100644
--- a/tools/pve/pbs-microcode.sh
+++ b/tools/pve/pbs-microcode.sh
@@ -30,7 +30,7 @@ CROSS="${RD}✗${CL}"
 msg_info() { echo -ne " ${HOLD} ${YW}$1..."; }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pbs-microcode" "pve"
 msg_ok() { echo -e "${BFR} ${CM} ${GN}$1${CL}"; }
 msg_error() { echo -e "${BFR} ${CROSS} ${RD}$1${CL}"; }
diff --git a/tools/pve/pbs3-upgrade.sh b/tools/pve/pbs3-upgrade.sh
index 3d2a0c8d0..dc9bce827 100644
--- a/tools/pve/pbs3-upgrade.sh
+++ b/tools/pve/pbs3-upgrade.sh
@@ -45,7 +45,7 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pbs3-upgrade" "pve"
 
 start_routines() {
diff --git a/tools/pve/pbs4-upgrade.sh b/tools/pve/pbs4-upgrade.sh
index 172617fd6..76106b7a0 100644
--- a/tools/pve/pbs4-upgrade.sh
+++ b/tools/pve/pbs4-upgrade.sh
@@ -33,7 +33,7 @@ msg_ok() { echo -e "${BFR} ${CM} ${GN}$1${CL}"; }
 msg_error() { echo -e "${BFR} ${CROSS} ${RD}$1${CL}"; }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pbs4-upgrade" "pve"
 
 start_routines() {
diff --git a/tools/pve/post-pbs-install.sh b/tools/pve/post-pbs-install.sh
index 1dbee5102..397c75991 100644
--- a/tools/pve/post-pbs-install.sh
+++ b/tools/pve/post-pbs-install.sh
@@ -33,7 +33,7 @@ msg_ok() { echo -e "${BFR} ${CM} ${GN}$1${CL}"; }
 msg_error() { echo -e "${BFR} ${CROSS} ${RD}$1${CL}"; }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "post-pbs-install" "pve"
 
 # ---- helpers ----
diff --git a/tools/pve/post-pdm-install.sh b/tools/pve/post-pdm-install.sh
index fd8f91487..373c174d4 100644
--- a/tools/pve/post-pdm-install.sh
+++ b/tools/pve/post-pdm-install.sh
@@ -44,7 +44,7 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "post-pdm-install" "pve"
 
 if ! dpkg -s proxmox-datacenter-manager >/dev/null 2>&1; then
diff --git a/tools/pve/post-pmg-install.sh b/tools/pve/post-pmg-install.sh
index 519fe39de..3fd90ba5e 100644
--- a/tools/pve/post-pmg-install.sh
+++ b/tools/pve/post-pmg-install.sh
@@ -44,7 +44,7 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "post-pmg-install" "pve"
 
 if ! dpkg -s proxmox-mailgateway-container >/dev/null 2>&1 &&
diff --git a/tools/pve/post-pve-install.sh b/tools/pve/post-pve-install.sh
index 335d132d4..2dd551a5e 100644
--- a/tools/pve/post-pve-install.sh
+++ b/tools/pve/post-pve-install.sh
@@ -45,7 +45,7 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "post-pve-install" "pve"
 
 get_pve_version() {
diff --git a/tools/pve/pve-privilege-converter.sh b/tools/pve/pve-privilege-converter.sh
index c9ecca773..601c68aa1 100644
--- a/tools/pve/pve-privilege-converter.sh
+++ b/tools/pve/pve-privilege-converter.sh
@@ -10,8 +10,8 @@ if ! command -v curl >/dev/null 2>&1; then
   apt-get update >/dev/null 2>&1
   apt-get install -y curl >/dev/null 2>&1
 fi
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 load_functions
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pve-privilege-converter" "pve"
 
diff --git a/tools/pve/pve8-upgrade.sh b/tools/pve/pve8-upgrade.sh
index 8b47080eb..6312302be 100644
--- a/tools/pve/pve8-upgrade.sh
+++ b/tools/pve/pve8-upgrade.sh
@@ -45,7 +45,7 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "pve8-upgrade" "pve"
 
 start_routines() {
diff --git a/tools/pve/scaling-governor.sh b/tools/pve/scaling-governor.sh
index 348f8e8aa..79622844c 100644
--- a/tools/pve/scaling-governor.sh
+++ b/tools/pve/scaling-governor.sh
@@ -7,7 +7,7 @@
 set -e
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "scaling-governor" "pve"
 
 header_info() {
diff --git a/tools/pve/storage-share-helper.sh b/tools/pve/storage-share-helper.sh
index 4319ad378..36f04f8ac 100644
--- a/tools/pve/storage-share-helper.sh
+++ b/tools/pve/storage-share-helper.sh
@@ -3,8 +3,8 @@
 # Author: MickLesk (CanbiZ)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/refs/heads/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 load_functions
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "storage-share-helper" "pve"
 
diff --git a/tools/pve/update-lxcs.sh b/tools/pve/update-lxcs.sh
index e083a4fc2..ec3dd34f2 100644
--- a/tools/pve/update-lxcs.sh
+++ b/tools/pve/update-lxcs.sh
@@ -26,7 +26,7 @@ GN=$(echo "\033[1;92m")
 CL=$(echo "\033[m")
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "update-lxcs" "pve"
 
 header_info
diff --git a/tools/pve/update-repo.sh b/tools/pve/update-repo.sh
index 9bd56b5a8..c84a3530f 100644
--- a/tools/pve/update-repo.sh
+++ b/tools/pve/update-repo.sh
@@ -24,7 +24,7 @@ GN=$(echo "\033[1;92m")
 CL=$(echo "\033[m")
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "update-repo" "pve"
 
 header_info
diff --git a/turnkey/turnkey.sh b/turnkey/turnkey.sh
index 063b90432..702fc21fb 100644
--- a/turnkey/turnkey.sh
+++ b/turnkey/turnkey.sh
@@ -4,9 +4,9 @@
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
 
 # Source shared libraries
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func)
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/api/api.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/core.func")
+source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/error_handler.func")
 load_functions
 catch_errors