diff --git a/.github/workflows/build_hybrid_lang_images.yml b/.github/workflows/build_hybrid_lang_images.yml
index 0610bb13..5372c1e8 100644
--- a/.github/workflows/build_hybrid_lang_images.yml
+++ b/.github/workflows/build_hybrid_lang_images.yml
@@ -73,7 +73,7 @@ jobs:
           OVOS_USER: 'ovos'
           PASSWORD: 'ovos'
           HOSTNAME: "raspOVOS"
-          CONSTRAINTS: "https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt"
+          CONSTRAINTS: "https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt"
           BASE_IMAGE_URL: "${{ needs.resolve-base.outputs.base_image_url }}"
         with:
           base-image-url: ${{ needs.resolve-base.outputs.base_image_url }}
diff --git a/.github/workflows/build_lite_lang_images.yml b/.github/workflows/build_lite_lang_images.yml
index 8fcf0a8a..e5a41a90 100644
--- a/.github/workflows/build_lite_lang_images.yml
+++ b/.github/workflows/build_lite_lang_images.yml
@@ -73,7 +73,7 @@ jobs:
           OVOS_USER: 'ovos'
           PASSWORD: 'ovos'
           HOSTNAME: "raspOVOS"
-          CONSTRAINTS: "https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt"
+          CONSTRAINTS: "https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt"
           BASE_IMAGE_URL: "${{ needs.resolve-base.outputs.base_image_url }}"
         with:
           base-image-url: ${{ needs.resolve-base.outputs.base_image_url }}
diff --git a/.github/workflows/build_offline_lang_images.yml b/.github/workflows/build_offline_lang_images.yml
index c0ed37cc..a7018157 100644
--- a/.github/workflows/build_offline_lang_images.yml
+++ b/.github/workflows/build_offline_lang_images.yml
@@ -73,7 +73,7 @@ jobs:
           OVOS_USER: 'ovos'
           PASSWORD: 'ovos'
           HOSTNAME: "raspOVOS"
-          CONSTRAINTS: "https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt"
+          CONSTRAINTS: "https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt"
           BASE_IMAGE_URL: "${{ needs.resolve-base.outputs.base_image_url }}"
         with:
           base-image-url: ${{ needs.resolve-base.outputs.base_image_url }}
diff --git a/.github/workflows/build_raspOVOS_full.yml b/.github/workflows/build_raspOVOS_full.yml
index d343a375..a98c0505 100644
--- a/.github/workflows/build_raspOVOS_full.yml
+++ b/.github/workflows/build_raspOVOS_full.yml
@@ -83,7 +83,7 @@ jobs:
           OVOS_USER: 'ovos'
           PASSWORD: 'ovos'
           HOSTNAME: "raspOVOS"
-          CONSTRAINTS: "https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt"
+          CONSTRAINTS: "https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt"
           BASE_IMAGE_URL: "${{ needs.resolve-base.outputs.base_image_url }}"
         with:
           base-image-url: ${{ needs.resolve-base.outputs.base_image_url }}
diff --git a/.github/workflows/build_raspOVOS_lite.yml b/.github/workflows/build_raspOVOS_lite.yml
index cc6dc734..dc4cee99 100644
--- a/.github/workflows/build_raspOVOS_lite.yml
+++ b/.github/workflows/build_raspOVOS_lite.yml
@@ -61,7 +61,7 @@ jobs:
           OVOS_USER: 'ovos'
           PASSWORD: 'ovos'
           HOSTNAME: "raspOVOS"
-          CONSTRAINTS: "https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt"
+          CONSTRAINTS: "https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt"
           BASE_IMAGE_URL: "${{ github.event.inputs.base_image_url || 'https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2025-05-13/2025-05-13-raspios-bookworm-arm64-lite.img.xz' }}"
         with:
           base-image-url: ${{ github.event.inputs.base_image_url || 'https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2025-05-13/2025-05-13-raspios-bookworm-arm64-lite.img.xz' }}
diff --git a/build_raspOVOS_base_full.sh b/build_raspOVOS_base_full.sh
index df444fd1..33704e8a 100644
--- a/build_raspOVOS_base_full.sh
+++ b/build_raspOVOS_base_full.sh
@@ -7,7 +7,9 @@ set -e
 
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
+# every uv/pip invocation is constrained, even ones missing an explicit -c
+export UV_CONSTRAINT="$CONSTRAINTS" PIP_CONSTRAINT="$CONSTRAINTS"
 
 
 # Retrieve the GID of the 'ovos' group
diff --git a/build_raspOVOS_base_lite.sh b/build_raspOVOS_base_lite.sh
index f899987d..d81c2fd3 100644
--- a/build_raspOVOS_base_lite.sh
+++ b/build_raspOVOS_base_lite.sh
@@ -9,7 +9,9 @@ set -e
 : "${OVOS_USER:=ovos}"
 : "${PASSWORD:=ovos}"
 : "${HOSTNAME:=raspOVOS}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
+# every uv/pip invocation is constrained, even ones missing an explicit -c
+export UV_CONSTRAINT="$CONSTRAINTS" PIP_CONSTRAINT="$CONSTRAINTS"
 
 
 # Rename the default 'pi' user if the current user is not 'pi'.
diff --git a/lang_builds/hybrid/build_raspOVOS_ca.sh b/lang_builds/hybrid/build_raspOVOS_ca.sh
index 582b0d67..bf10a896 100644
--- a/lang_builds/hybrid/build_raspOVOS_ca.sh
+++ b/lang_builds/hybrid/build_raspOVOS_ca.sh
@@ -8,13 +8,14 @@ set -e
 ## Intended to run on top of the raspOVOS LITE image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from lite image
 bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_ca.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang ca-ES --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_da.sh b/lang_builds/hybrid/build_raspOVOS_da.sh
index 583b2f2e..acdff92b 100644
--- a/lang_builds/hybrid/build_raspOVOS_da.sh
+++ b/lang_builds/hybrid/build_raspOVOS_da.sh
@@ -8,7 +8,7 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 
 # start from lite image
@@ -16,6 +16,7 @@ bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_da.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang da-DK --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_de.sh b/lang_builds/hybrid/build_raspOVOS_de.sh
index c02e9310..a90a524f 100644
--- a/lang_builds/hybrid/build_raspOVOS_de.sh
+++ b/lang_builds/hybrid/build_raspOVOS_de.sh
@@ -8,7 +8,7 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 
 # start from lite image
@@ -16,6 +16,7 @@ bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_de.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang de-DE --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_en.sh b/lang_builds/hybrid/build_raspOVOS_en.sh
index 045caea0..34776aad 100644
--- a/lang_builds/hybrid/build_raspOVOS_en.sh
+++ b/lang_builds/hybrid/build_raspOVOS_en.sh
@@ -8,7 +8,7 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 
 # start from lite image
@@ -16,6 +16,7 @@ bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_en.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang en-US --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_es.sh b/lang_builds/hybrid/build_raspOVOS_es.sh
index 15525686..80e3f09e 100644
--- a/lang_builds/hybrid/build_raspOVOS_es.sh
+++ b/lang_builds/hybrid/build_raspOVOS_es.sh
@@ -8,13 +8,14 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from lite image
 bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_es.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang es-ES --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_eu.sh b/lang_builds/hybrid/build_raspOVOS_eu.sh
index 1cb97400..accf0748 100644
--- a/lang_builds/hybrid/build_raspOVOS_eu.sh
+++ b/lang_builds/hybrid/build_raspOVOS_eu.sh
@@ -8,13 +8,14 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from lite image
 bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_eu.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang eu-ES --hybrid --female --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_fr.sh b/lang_builds/hybrid/build_raspOVOS_fr.sh
index 67d628b0..8f250b45 100644
--- a/lang_builds/hybrid/build_raspOVOS_fr.sh
+++ b/lang_builds/hybrid/build_raspOVOS_fr.sh
@@ -8,7 +8,7 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 
 # start from lite image
@@ -16,6 +16,7 @@ bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_fr.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang fr-FR --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_gl.sh b/lang_builds/hybrid/build_raspOVOS_gl.sh
index f486da8c..5bfbcbb8 100644
--- a/lang_builds/hybrid/build_raspOVOS_gl.sh
+++ b/lang_builds/hybrid/build_raspOVOS_gl.sh
@@ -8,13 +8,14 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from lite image
 bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_gl.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang gl-ES --hybrid --female --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_it.sh b/lang_builds/hybrid/build_raspOVOS_it.sh
index b9bd2c3a..e1d1b496 100644
--- a/lang_builds/hybrid/build_raspOVOS_it.sh
+++ b/lang_builds/hybrid/build_raspOVOS_it.sh
@@ -8,7 +8,7 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 ## Intended to run on top of the image generated by build_raspOVOS.sh
 
@@ -17,6 +17,7 @@ bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_it.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang it-IT --hybrid --female --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_mul.sh b/lang_builds/hybrid/build_raspOVOS_mul.sh
index c7969e15..a10d2924 100644
--- a/lang_builds/hybrid/build_raspOVOS_mul.sh
+++ b/lang_builds/hybrid/build_raspOVOS_mul.sh
@@ -8,10 +8,11 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/en/* /
diff --git a/lang_builds/hybrid/build_raspOVOS_nl.sh b/lang_builds/hybrid/build_raspOVOS_nl.sh
index 9de5c6c6..21f47894 100644
--- a/lang_builds/hybrid/build_raspOVOS_nl.sh
+++ b/lang_builds/hybrid/build_raspOVOS_nl.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from lite image
 bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_nl.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang nl-NL --hybrid --male --platform rpi4
diff --git a/lang_builds/hybrid/build_raspOVOS_pt.sh b/lang_builds/hybrid/build_raspOVOS_pt.sh
index da9decf3..06d4c342 100644
--- a/lang_builds/hybrid/build_raspOVOS_pt.sh
+++ b/lang_builds/hybrid/build_raspOVOS_pt.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from lite image
 bash /mounted-github-repo/lang_builds/lite/build_raspOVOS_pt.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang pt-PT --hybrid --male --platform rpi4
diff --git a/lang_builds/lite/build_raspOVOS_ca.sh b/lang_builds/lite/build_raspOVOS_ca.sh
index ab30fb66..447f3caa 100644
--- a/lang_builds/lite/build_raspOVOS_ca.sh
+++ b/lang_builds/lite/build_raspOVOS_ca.sh
@@ -7,11 +7,12 @@ set -e
 
 ## Intended to run on top of the image generated by build_raspOVOS.sh
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/ca/* /
diff --git a/lang_builds/lite/build_raspOVOS_da.sh b/lang_builds/lite/build_raspOVOS_da.sh
index 0cfa622c..c250b07d 100644
--- a/lang_builds/lite/build_raspOVOS_da.sh
+++ b/lang_builds/lite/build_raspOVOS_da.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 # TODO - no wake word for "wake up"
 #echo "Copying overlays..."
diff --git a/lang_builds/lite/build_raspOVOS_de.sh b/lang_builds/lite/build_raspOVOS_de.sh
index 57a69130..aea694b6 100644
--- a/lang_builds/lite/build_raspOVOS_de.sh
+++ b/lang_builds/lite/build_raspOVOS_de.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/de/* /
diff --git a/lang_builds/lite/build_raspOVOS_en.sh b/lang_builds/lite/build_raspOVOS_en.sh
index c80dfac5..ed799cf7 100644
--- a/lang_builds/lite/build_raspOVOS_en.sh
+++ b/lang_builds/lite/build_raspOVOS_en.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/en/* /
diff --git a/lang_builds/lite/build_raspOVOS_es.sh b/lang_builds/lite/build_raspOVOS_es.sh
index 06623ace..be159a2e 100644
--- a/lang_builds/lite/build_raspOVOS_es.sh
+++ b/lang_builds/lite/build_raspOVOS_es.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/es/* /
diff --git a/lang_builds/lite/build_raspOVOS_eu.sh b/lang_builds/lite/build_raspOVOS_eu.sh
index 80ccf9c5..174d7f58 100644
--- a/lang_builds/lite/build_raspOVOS_eu.sh
+++ b/lang_builds/lite/build_raspOVOS_eu.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/eu/* /
diff --git a/lang_builds/lite/build_raspOVOS_fr.sh b/lang_builds/lite/build_raspOVOS_fr.sh
index 69137d1b..b72956d3 100644
--- a/lang_builds/lite/build_raspOVOS_fr.sh
+++ b/lang_builds/lite/build_raspOVOS_fr.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 # TODO - no wake word for "wake up"
 #echo "Copying overlays..."
diff --git a/lang_builds/lite/build_raspOVOS_gl.sh b/lang_builds/lite/build_raspOVOS_gl.sh
index 52187ff5..120f6317 100644
--- a/lang_builds/lite/build_raspOVOS_gl.sh
+++ b/lang_builds/lite/build_raspOVOS_gl.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/gl/* /
diff --git a/lang_builds/lite/build_raspOVOS_it.sh b/lang_builds/lite/build_raspOVOS_it.sh
index fe7bef30..cbb6ce8e 100644
--- a/lang_builds/lite/build_raspOVOS_it.sh
+++ b/lang_builds/lite/build_raspOVOS_it.sh
@@ -6,12 +6,13 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 ## Intended to run on top of the image generated by build_raspOVOS.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/it/* /
diff --git a/lang_builds/lite/build_raspOVOS_nl.sh b/lang_builds/lite/build_raspOVOS_nl.sh
index ba42e2c5..372ba110 100644
--- a/lang_builds/lite/build_raspOVOS_nl.sh
+++ b/lang_builds/lite/build_raspOVOS_nl.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/nl/* /
diff --git a/lang_builds/lite/build_raspOVOS_pt.sh b/lang_builds/lite/build_raspOVOS_pt.sh
index b1b47ca6..b01c12dd 100644
--- a/lang_builds/lite/build_raspOVOS_pt.sh
+++ b/lang_builds/lite/build_raspOVOS_pt.sh
@@ -6,10 +6,11 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Copying overlays..."
 sudo cp -rv /mounted-github-repo/overlays/pt/* /
diff --git a/lang_builds/offline/build_raspOVOS_ca.sh b/lang_builds/offline/build_raspOVOS_ca.sh
index d5e540e9..a53ca661 100644
--- a/lang_builds/offline/build_raspOVOS_ca.sh
+++ b/lang_builds/offline/build_raspOVOS_ca.sh
@@ -8,13 +8,14 @@ set -e
 ## Intended to run on top of the raspOVOS FULL image
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_ca.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang ca-ES --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_da.sh b/lang_builds/offline/build_raspOVOS_da.sh
index e796cf8e..5b32b2fb 100644
--- a/lang_builds/offline/build_raspOVOS_da.sh
+++ b/lang_builds/offline/build_raspOVOS_da.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_da.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang de-DE --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_de.sh b/lang_builds/offline/build_raspOVOS_de.sh
index f38bd439..127b9566 100644
--- a/lang_builds/offline/build_raspOVOS_de.sh
+++ b/lang_builds/offline/build_raspOVOS_de.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_de.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang de-DE --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_en.sh b/lang_builds/offline/build_raspOVOS_en.sh
index db0bfe13..0e4eca4f 100644
--- a/lang_builds/offline/build_raspOVOS_en.sh
+++ b/lang_builds/offline/build_raspOVOS_en.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_en.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang en-US --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_es.sh b/lang_builds/offline/build_raspOVOS_es.sh
index 171f4a5b..15f88ef1 100644
--- a/lang_builds/offline/build_raspOVOS_es.sh
+++ b/lang_builds/offline/build_raspOVOS_es.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_es.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang es-ES --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_eu.sh b/lang_builds/offline/build_raspOVOS_eu.sh
index aac0fe18..c3d50871 100644
--- a/lang_builds/offline/build_raspOVOS_eu.sh
+++ b/lang_builds/offline/build_raspOVOS_eu.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_eu.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang eu-ES --offline --female --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_fr.sh b/lang_builds/offline/build_raspOVOS_fr.sh
index 6a99d575..18275cfe 100644
--- a/lang_builds/offline/build_raspOVOS_fr.sh
+++ b/lang_builds/offline/build_raspOVOS_fr.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_fr.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang fr-FR --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_gl.sh b/lang_builds/offline/build_raspOVOS_gl.sh
index 8d1c21e1..cf353ab7 100644
--- a/lang_builds/offline/build_raspOVOS_gl.sh
+++ b/lang_builds/offline/build_raspOVOS_gl.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_gl.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang gl-ES --offline --female --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_it.sh b/lang_builds/offline/build_raspOVOS_it.sh
index 9cd427a8..1c200e7c 100644
--- a/lang_builds/offline/build_raspOVOS_it.sh
+++ b/lang_builds/offline/build_raspOVOS_it.sh
@@ -6,7 +6,7 @@
 set -e
 
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 ## Intended to run on top of the raspOVOS FULL image
 
@@ -15,6 +15,7 @@ bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_it.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang it-IT --offline --female --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_nl.sh b/lang_builds/offline/build_raspOVOS_nl.sh
index b7453db1..84fbab13 100644
--- a/lang_builds/offline/build_raspOVOS_nl.sh
+++ b/lang_builds/offline/build_raspOVOS_nl.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_nl.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang n-NL --offline --male --platform rpi5
diff --git a/lang_builds/offline/build_raspOVOS_pt.sh b/lang_builds/offline/build_raspOVOS_pt.sh
index cbbdf978..bd8c0d3a 100644
--- a/lang_builds/offline/build_raspOVOS_pt.sh
+++ b/lang_builds/offline/build_raspOVOS_pt.sh
@@ -7,13 +7,14 @@ set -e
 
 ## Intended to run on top of the raspOVOS FULL image
 : "${OVOS_USER:=ovos}"
-: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt}"
+: "${CONSTRAINTS:=https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt}"
 
 # start from hybrid image
 bash /mounted-github-repo/lang_builds/hybrid/build_raspOVOS_pt.sh
 
 # Activate the virtual environment
 source /home/$OVOS_USER/.venvs/ovos/bin/activate
+export UV_CONSTRAINT="${CONSTRAINTS:-}" PIP_CONSTRAINT="${CONSTRAINTS:-}"
 
 echo "Configuring for target language..."
 /home/$OVOS_USER/.venvs/ovos/bin/ovos-config autoconfigure --lang pt-PT --offline --male --platform rpi5
diff --git a/overlays/base_ovos/home/ovos/.bash_aliases b/overlays/base_ovos/home/ovos/.bash_aliases
index 8516e774..6d3801f1 100644
--- a/overlays/base_ovos/home/ovos/.bash_aliases
+++ b/overlays/base_ovos/home/ovos/.bash_aliases
@@ -9,13 +9,13 @@ alias ovos-restart="systemctl --user restart ovos"
 alias ovos-freeze="uv pip list --format=freeze | grep -E 'ovos-|skill-' > requirements.txt"
 
 # To attempt to recover a system
-alias ovos-force-reinstall="uv pip install --pre ovos-docs-viewer ovos-utils[extras] ovos-dinkum-listener[extras,linux,onnx] tflite_runtime ovos-phal[extras,linux] ovos-audio[extras] ovos-gui ovos-core[lgpl,plugins,skills-audio,skills-essential,skills-internet,skills-media,skills-extra] -c https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-testing.txt --force-reinstall"
+alias ovos-force-reinstall="uv pip install --pre ovos-docs-viewer ovos-utils[extras] ovos-dinkum-listener[extras,linux,onnx] tflite_runtime ovos-phal[extras,linux] ovos-audio[extras] ovos-gui ovos-core[lgpl,plugins,skills-audio,skills-essential,skills-internet,skills-media,skills-extra] -c https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-testing.txt --force-reinstall"
 
 # OVOS Outdated: List outdated OVOS and skill-related packages
 alias ovos-outdated="uv pip list --outdated | grep -E 'ovos-|skill-'"
 
 # OVOS Pip: Run pip commands with a constraints file
-alias ovos-install="uv pip install -c https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-alpha.txt"
+alias ovos-install="uv pip install -c https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-alpha.txt"
 
 # OVOS quick docs:
 alias ovos-manual="~/.venvs/ovos/bin/ovos-docs-viewer technical"
diff --git a/overlays/base_ovos/usr/local/bin/ovos-update b/overlays/base_ovos/usr/local/bin/ovos-update
index d009285a..ac367136 100644
--- a/overlays/base_ovos/usr/local/bin/ovos-update
+++ b/overlays/base_ovos/usr/local/bin/ovos-update
@@ -45,7 +45,8 @@ fi
 print_message "Using update tag: $TAG" "info"
 
 # Set the constraints file based on the tag
-CONSTRAINTS="https://github.com/OpenVoiceOS/ovos-releases/raw/refs/heads/main/constraints-$TAG.txt"
+CONSTRAINTS="https://github.com/OpenVoiceOS/OpenVoiceOS/raw/refs/heads/main/constraints-$TAG.txt"
+export UV_CONSTRAINT="$CONSTRAINTS" PIP_CONSTRAINT="$CONSTRAINTS"
 
 # Print information about the constraints file
 print_message "Using constraints file: $CONSTRAINTS" "info"