diff --git a/tools/pve/add-iptag.sh b/tools/pve/add-iptag.sh
index a2714f52f..9acff9953 100644
--- a/tools/pve/add-iptag.sh
+++ b/tools/pve/add-iptag.sh
@@ -32,7 +32,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..917150fb3 100644
--- a/tools/pve/clean-lxcs.sh
+++ b/tools/pve/clean-lxcs.sh
@@ -24,7 +24,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..52a987fae 100644
--- a/tools/pve/clean-orphaned-lvm.sh
+++ b/tools/pve/clean-orphaned-lvm.sh
@@ -17,7 +17,8 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..645a835fc 100644
--- a/tools/pve/container-restore-from-backup.sh
+++ b/tools/pve/container-restore-from-backup.sh
@@ -45,7 +45,8 @@ EOF
 header_info
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..dc2fd6fe3 100644
--- a/tools/pve/core-restore-from-backup.sh
+++ b/tools/pve/core-restore-from-backup.sh
@@ -45,7 +45,8 @@ EOF
 header_info
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..e9e2ef961 100755
--- a/tools/pve/disk-health.sh
+++ b/tools/pve/disk-health.sh
@@ -5,8 +5,9 @@
 # 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/core/core.func")
+source <(curl -fsSL "${_CS_CORE_URL}/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..7a4b796a3 100644
--- a/tools/pve/execute.sh
+++ b/tools/pve/execute.sh
@@ -24,7 +24,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..cb84a5d25 100644
--- a/tools/pve/frigate-support.sh
+++ b/tools/pve/frigate-support.sh
@@ -17,7 +17,8 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..f5c7d85c0 100644
--- a/tools/pve/fstrim.sh
+++ b/tools/pve/fstrim.sh
@@ -20,7 +20,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..2c9b9dadc 100644
--- a/tools/pve/guest-delete.sh
+++ b/tools/pve/guest-delete.sh
@@ -39,7 +39,8 @@ TAB="  "
 CM="${TAB}✔️${TAB}${CL}"
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..edb92335c 100644
--- a/tools/pve/host-backup.sh
+++ b/tools/pve/host-backup.sh
@@ -17,7 +17,8 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..70ab04a8a 100644
--- a/tools/pve/hw-acceleration.sh
+++ b/tools/pve/hw-acceleration.sh
@@ -31,7 +31,8 @@ CM="${GN}✓${CL}"
 set -e
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..92f59e14e 100644
--- a/tools/pve/kernel-clean.sh
+++ b/tools/pve/kernel-clean.sh
@@ -23,7 +23,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..b1cbb28cc 100644
--- a/tools/pve/kernel-pin.sh
+++ b/tools/pve/kernel-pin.sh
@@ -27,7 +27,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..78be9953b 100644
--- a/tools/pve/microcode.sh
+++ b/tools/pve/microcode.sh
@@ -30,7 +30,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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 2f98eac97..1764adc47 100644
--- a/tools/pve/monitor-all.sh
+++ b/tools/pve/monitor-all.sh
@@ -16,7 +16,8 @@ cat <<"EOF"
 EOF
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..2cbf5ebea 100644
--- a/tools/pve/nic-offloading-fix.sh
+++ b/tools/pve/nic-offloading-fix.sh
@@ -34,7 +34,8 @@ EOF
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..c33883a69 100644
--- a/tools/pve/pbs-microcode.sh
+++ b/tools/pve/pbs-microcode.sh
@@ -30,7 +30,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..c5ab09e2e 100644
--- a/tools/pve/pbs3-upgrade.sh
+++ b/tools/pve/pbs3-upgrade.sh
@@ -45,7 +45,8 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..71921b7cf 100644
--- a/tools/pve/pbs4-upgrade.sh
+++ b/tools/pve/pbs4-upgrade.sh
@@ -33,7 +33,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..ae1de948b 100644
--- a/tools/pve/post-pbs-install.sh
+++ b/tools/pve/post-pbs-install.sh
@@ -33,7 +33,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..b655320ab 100644
--- a/tools/pve/post-pdm-install.sh
+++ b/tools/pve/post-pdm-install.sh
@@ -44,7 +44,8 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..6d7adf4d3 100644
--- a/tools/pve/post-pmg-install.sh
+++ b/tools/pve/post-pmg-install.sh
@@ -44,7 +44,8 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..f4255d213 100644
--- a/tools/pve/post-pve-install.sh
+++ b/tools/pve/post-pve-install.sh
@@ -45,7 +45,8 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..1192c39d7 100644
--- a/tools/pve/pve-privilege-converter.sh
+++ b/tools/pve/pve-privilege-converter.sh
@@ -10,8 +10,9 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/core/core.func")
+source <(curl -fsSL "${_CS_CORE_URL}/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..e3af0ca08 100644
--- a/tools/pve/pve8-upgrade.sh
+++ b/tools/pve/pve8-upgrade.sh
@@ -45,7 +45,8 @@ msg_error() {
 }
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..79a85748c 100644
--- a/tools/pve/scaling-governor.sh
+++ b/tools/pve/scaling-governor.sh
@@ -7,7 +7,8 @@
 set -e
 
 # Telemetry
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..670f6aed4 100644
--- a/tools/pve/storage-share-helper.sh
+++ b/tools/pve/storage-share-helper.sh
@@ -3,8 +3,9 @@
 # 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/core/core.func")
+source <(curl -fsSL "${_CS_CORE_URL}/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..1ed8640c8 100644
--- a/tools/pve/update-lxcs.sh
+++ b/tools/pve/update-lxcs.sh
@@ -26,7 +26,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/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..3301e47b7 100644
--- a/tools/pve/update-repo.sh
+++ b/tools/pve/update-repo.sh
@@ -24,7 +24,8 @@ 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
+_CS_CORE_URL="${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}"
+source <(curl -fsSL "${_CS_CORE_URL}/api/api.func") 2>/dev/null || true
 declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "update-repo" "pve"
 
 header_info