diff --git a/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/PyBluez-0.23-cp310-cp310-linux_aarch64.whl b/overlays/41-neon-core/root/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/PyBluez-0.23-cp310-cp310-linux_aarch64.whl
similarity index 100%
rename from overlays/46-audio-receiver/home/neon/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/PyBluez-0.23-cp310-cp310-linux_aarch64.whl
rename to overlays/41-neon-core/root/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/PyBluez-0.23-cp310-cp310-linux_aarch64.whl
diff --git a/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/origin.json b/overlays/41-neon-core/root/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/origin.json
similarity index 100%
rename from overlays/46-audio-receiver/home/neon/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/origin.json
rename to overlays/41-neon-core/root/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/origin.json
diff --git a/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/PyGObject-3.44.1-cp310-cp310-linux_aarch64.whl b/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/PyGObject-3.44.1-cp310-cp310-linux_aarch64.whl
deleted file mode 100644
index 3fe91e11..00000000
Binary files a/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/PyGObject-3.44.1-cp310-cp310-linux_aarch64.whl and /dev/null differ
diff --git a/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/origin.json b/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/origin.json
deleted file mode 100644
index ee80a37f..00000000
--- a/overlays/46-audio-receiver/home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/origin.json
+++ /dev/null
@@ -1 +0,0 @@
-{"archive_info": {"hash": "sha256=665fbe980c91e8b31ad78ed3f66879946948200864002d193f67eccc1d7d5d83", "hashes": {"sha256": "665fbe980c91e8b31ad78ed3f66879946948200864002d193f67eccc1d7d5d83"}}, "url": "https://files.pythonhosted.org/packages/44/80/96d6317a15a13a4f80ffa61118dc144a70756135fbc6ace30f9b033f51f7/PyGObject-3.44.1.tar.gz"}
\ No newline at end of file
diff --git a/recipes/41-install-neon-core.yml b/recipes/41-install-neon-core.yml
index fea8a6b0..e12d871d 100755
--- a/recipes/41-install-neon-core.yml
+++ b/recipes/41-install-neon-core.yml
@@ -25,6 +25,13 @@ actions:
       - unzip
       - ffmpeg
       - make
+  - action: apt
+    description: Install Audio Receiver Dependencies
+    packages:
+      - "bluez*" # Bluetooth
+      - libbluetooth-dev
+      - libcairo2-dev
+      - libgirepository1.0-dev
   - action: overlay
     description: Neon Core Overlay
     source: ../overlays/41-neon-core
diff --git a/recipes/46-audio-receiver.yml b/recipes/46-audio-receiver.yml
index 4838a6fc..899803fb 100755
--- a/recipes/46-audio-receiver.yml
+++ b/recipes/46-audio-receiver.yml
@@ -10,9 +10,6 @@ actions:
       - curl
       - uxplay # AirPlay
       - kdeconnect # KDE Connect
-      - "bluez*" # Bluetooth
-      - libbluetooth-dev
-      - libcairo2-dev
       - pulseaudio-module-bluetooth # PulseAudio Bluetooth Module
   - action: overlay
     description: Audio receiver scripts, configs, and service files
diff --git a/scripts/41-install-neon-core.sh b/scripts/41-install-neon-core.sh
index e57e7cad..1024ec43 100755
--- a/scripts/41-install-neon-core.sh
+++ b/scripts/41-install-neon-core.sh
@@ -42,14 +42,14 @@ rm /boot/firmware/overlays/sj201-rev10-pwm-fan-overlay.dtbo
 # Configure venv for deepspeech compat.
 python3.10 -m venv "/home/neon/venv" || exit 10
 . /home/neon/venv/bin/activate
-pip install --upgrade pip wheel
+pip install --upgrade pip wheel setuptools
+
 mv /home/neon/pip /home/neon/venv/bin/pip
 chmod ugo+x /home/neon/venv/bin/pip
 
 # Install core and skills
 export NEON_IN_SETUP="true"
-# TODO: Normalize extras after NeonCore 24.2.x stable release
-pip install --use-pep517 "neon-core[core_modules,skills_required,skills_essential,skills_default,skills_extended,pi] @ git+https://github.com/neongeckocom/neoncore@${CORE_REF}" || exit 11
+pip install --use-pep517 "neon-core[core-modules,skills-required,skills-essential,skills-default,skills-extended,pi,audio-receiver] @ git+https://github.com/neongeckocom/neoncore@${CORE_REF}" || exit 11
 echo "Core Installed"
 neon install-default-skills && echo "Default git skills installed" || exit 2
 
diff --git a/scripts/46-audio-receiver.sh b/scripts/46-audio-receiver.sh
index fcdfe2ee..26086558 100755
--- a/scripts/46-audio-receiver.sh
+++ b/scripts/46-audio-receiver.sh
@@ -20,12 +20,5 @@ systemctl enable raspotify.service
 systemctl enable update_bt_config.service
 
 # Fix permissions
-chown -R neon:neon /home/neon/.cache
 chmod +x /opt/neon/*.sh
 
-# Install packages for Bluetooth pairing script
-# TODO: Python packages to NeonCore dependencies(?)
-if [ -e /home/neon/venv/bin/python ]; then
-  /home/neon/venv/bin/python -m pip install /home/neon/.cache/pip/wheels/5a/83/f3/aa5c753e241ee76cc586065f88f0e750c9bb370c181f1ab40a/PyBluez-0.23-cp310-cp310-linux_aarch64.whl
-  /home/neon/venv/bin/python -m pip install /home/neon/.cache/pip/wheels/33/99/2c/061d0c6934509a9cc08470980d68fbfc972bd22a45c3f306d6/PyGObject-3.44.1-cp310-cp310-linux_aarch64.whl
-fi
\ No newline at end of file