diff --git a/ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2 b/ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2
index a1be718..b570a9b 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2
@@ -1,54 +1,34 @@
+ovos-messagebus
+ovos-core[lgpl,plugins]
+ovos-PHAL[extras,linux]
+ovos-dinkum-listener[extras,linux]
 ovos-audio[extras]
-ovos-audio-plugin-mpv
-ovos-audio-plugin-simple
+
 {% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") %}
 ovos-audio-transformer-plugin-ggwave
 {% endif %}
-ovos-backend-client
-ovos-classifiers
-ovos-core[lgpl]
-ovos-dinkum-listener
-ovos-microphone-plugin-alsa
-ovos-stt-plugin-server
-ovos-vad-plugin-webrtcvad
-ovos-messagebus
-ovos-microphone-plugin-alsa
-ovos-microphone-plugin-sounddevice
-ovos-PHAL
-ovos-PHAL-plugin-alsa
-ovos-PHAL-plugin-system
-ovos-PHAL-plugin-ipgeo
-ovos-plugin-manager
-ovos-translate-server-plugin
-ovos-stt-plugin-vosk
-{% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") %}
-ovos-ww-plugin-openwakeword
+
+ovos-tts-plugin-polly
+
 {% if ovos_installer_cpu_is_capable | bool %}
-ovos-vad-plugin-silero
-ovos-ww-plugin-precise-lite
-{% endif %}
-ovos-ww-plugin-vosk
+ovos-dinkum-listener[onnx]
 {% endif %}
 
-# No PyPi release
-git+https://github.com/OpenVoiceOS/ovos-bidirectional-translation-plugin.git
-git+https://github.com/OpenVoiceOS/ovos-cli-client.git
-git+https://github.com/OpenVoiceOS/ovos-docs-viewer.git
-git+https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin.git
 {% if 'tas5806' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-hotkeys.git
+ovos-PHAL[mk2]
 {% endif %}
+
 {% if 'atmega328p' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-mk1.git
+ovos-PHAL[mk1]
 {% endif %}
+
 {% if 'attiny1614' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-mk2-v6-fan-control.git
+ovos-PHAL[mk2dev]
 git+https://github.com/OVOSHatchery/ovos-PHAL-plugin-sj201-leds.git
 {% endif %}
-git+https://github.com/OpenVoiceOS/ovos-stt-plugin-chromium.git
-git+https://github.com/OpenVoiceOS/ovos-tts-plugin-polly.git
-git+https://github.com/OpenVoiceOS/ovos-utterance-corrections-plugin.git
-git+https://github.com/OpenVoiceOS/ovos-utterance-plugin-cancel
+
+# No PyPi release
+git+https://github.com/OpenVoiceOS/ovos-cli-client.git
 
 # Non-OVOS libraries
 #neon-mana-utils #Commented until PyYAML requirement is fixed
diff --git a/ansible/roles/ovos_installer/templates/virtualenv/extra-skills-requirements.txt.j2 b/ansible/roles/ovos_installer/templates/virtualenv/extra-skills-requirements.txt.j2
index 3d06e5a..73dac93 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/extra-skills-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/extra-skills-requirements.txt.j2
@@ -1,11 +1,9 @@
+ovos-core[skills-internet,skills-media]
+ovos-skill-icanhazdadjokes
+
 # No PyPi release
-git+https://github.com/OpenVoiceOS/skill-ovos-icanhazdadjokes.git
-git+https://github.com/OpenVoiceOS/skill-ovos-fallback-chatgpt.git
-git+https://github.com/OpenVoiceOS/skill-ovos-parrot.git
 git+https://github.com/OpenVoiceOS/skill-ovos-randomness.git
-git+https://github.com/OpenVoiceOS/skill-ovos-wolfie.git
 
-# Non-OVOS libraries
 {% if ovos_installer_profile != "server" %}
 git+https://github.com/OpenVoiceOS/ovos-skill-easter-eggs.git
 {% endif %}
diff --git a/ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2 b/ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2
index ddaff01..ad65595 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2
@@ -1,28 +1,24 @@
-ovos-audio-plugin-mpv
-ovos-audio-plugin-simple
+ovos-audio[extras]
+ovos-dinkum-listener[extras,linux]
+ovos-PHAL[extras,linux]
 ovos-backend-client
 ovos-classifiers
-ovos-plugin-common-play
-ovos-microphone-plugin-sounddevice
-ovos-PHAL
-ovos-PHAL-plugin-alsa
-ovos-PHAL-plugin-ipgeo
-ovos-vad-plugin-webrtcvad
-{% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") %}
-ovos-ww-plugin-openwakeword
-{% endif %}
+
+ovos-tts-plugin-polly
+
 {% if ovos_installer_cpu_is_capable | bool %}
-ovos-ww-plugin-precise-lite
+ovos-dinkum-listener[onnx]
+{% endif %}
+
+{% if 'atmega328p' in ovos_installer_i2c_devices %}
+ovos-PHAL[mk1]
+{% endif %}
+
+{% if 'tas5806' in ovos_installer_i2c_devices %}
+ovos-PHAL[mk2]
 {% endif %}
 
 # No PyPi release
 git+https://github.com/JarbasHiveMind/HiveMind-voice-sat.git
 git+https://github.com/JarbasHiveMind/hivemind_websocket_client.git
-{% if 'tas5806' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-hotkeys.git
-{% endif %}
-{% if 'atmega328p' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-mk1.git
-{% endif %}
-git+https://github.com/OpenVoiceOS/ovos-stt-plugin-chromium.git
-git+https://github.com/OpenVoiceOS/ovos-tts-plugin-polly.git
+
diff --git a/ansible/roles/ovos_installer/templates/virtualenv/server-requirements.txt.j2 b/ansible/roles/ovos_installer/templates/virtualenv/server-requirements.txt.j2
index 55b8d69..d1ee081 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/server-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/server-requirements.txt.j2
@@ -4,5 +4,5 @@ git+https://github.com/JarbasHiveMind/HiveMind-presence.git
 git+https://github.com/JarbasHiveMind/hivemind_websocket_client.git
 
 # OVOS
-ovos-core[lgpl]
+ovos-core[lgpl,plugins]
 ovos-messagebus
diff --git a/ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2 b/ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2
index ff36c44..2db0b0a 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2
@@ -1,20 +1,11 @@
-ovos-skill-alerts
-ovos-skill-date-time
-ovos-skill-fallback-unknown
-ovos-skill-hello-world
-ovos-skill-personal
-ovos-skill-volume
+ovos-core[skills-essential]
+
+{% if ovos_installer_profile != "server" %}
+ovos-core[skills-audio]
+{% endif %}
 
 # No PyPi release
 {% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") or (ovos_installer_profile != "server") %}
 git+https://github.com/OpenVoiceOS/ovos-skill-ggwave.git
 {% endif %}
-{% if ovos_installer_profile != "server" %}
-git+https://github.com/OpenVoiceOS/skill-ovos-boot-finished.git
-{% endif %}
-git+https://github.com/OpenVoiceOS/skill-ovos-ddg.git
-git+https://github.com/OpenVoiceOS/skill-ovos-local-media.git
-git+https://github.com/OpenVoiceOS/skill-ovos-naptime.git
-git+https://github.com/OpenVoiceOS/skill-ovos-news.git
-git+https://github.com/OpenVoiceOS/skill-ovos-weather.git
-git+https://github.com/OpenVoiceOS/skill-ovos-wikipedia.git
+