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 a1be7186..61bd196d 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/core-requirements.txt.j2
@@ -20,7 +20,9 @@ ovos-PHAL-plugin-system
 ovos-PHAL-plugin-ipgeo
 ovos-plugin-manager
 ovos-translate-server-plugin
+ovos-stt-plugin-chromium
 ovos-stt-plugin-vosk
+ovos-tts-plugin-polly
 {% if (ansible_architecture == "x86_64") or (ansible_architecture == "aarch64") %}
 ovos-ww-plugin-openwakeword
 {% if ovos_installer_cpu_is_capable | bool %}
@@ -29,26 +31,23 @@ ovos-ww-plugin-precise-lite
 {% endif %}
 ovos-ww-plugin-vosk
 {% 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
+ovos_plugin_common_play
+ovos-bidirectional-translation-plugin
+ovos-utterance-corrections-plugin
+ovos-utterance-plugin-cancel
 {% if 'tas5806' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-hotkeys.git
+ovos-PHAL-plugin-hotkeys
 {% endif %}
 {% if 'atmega328p' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-mk1.git
+ovos-PHAL-plugin-mk1
 {% endif %}
+
+# No PyPi release
+git+https://github.com/OpenVoiceOS/ovos-cli-client.git
 {% if 'attiny1614' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-mk2-v6-fan-control.git
+ovos-PHAL-plugin-mk2-fan-control
 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
 
 # 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 3d06e5a4..1d54f5f2 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,9 +1,10 @@
+skill-wolfie
+skill-ovos-fallback-chatgpt
+ovos-skill-parrot
+
 # 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" %}
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 ddaff01d..3865e050 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/satellite-requirements.txt.j2
@@ -19,10 +19,10 @@ ovos-ww-plugin-precise-lite
 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
+ovos-PHAL-plugin-hotkeys
 {% endif %}
 {% if 'atmega328p' in ovos_installer_i2c_devices %}
-git+https://github.com/OpenVoiceOS/ovos-PHAL-plugin-mk1.git
+ovos-PHAL-plugin-mk1
 {% endif %}
-git+https://github.com/OpenVoiceOS/ovos-stt-plugin-chromium.git
-git+https://github.com/OpenVoiceOS/ovos-tts-plugin-polly.git
+ovos-stt-plugin-chromium
+ovos-tts-plugin-polly
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 ff36c443..69a051cc 100644
--- a/ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2
+++ b/ansible/roles/ovos_installer/templates/virtualenv/skills-requirements.txt.j2
@@ -10,11 +10,11 @@ ovos-skill-volume
 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
+ovos-skill-boot-finished
 {% 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
+skill-ddg
+ovos-skill-local-media
+ovos-skill-naptime
+skill-news
+ovos-skill-weather
+ovos-skill-wikipedia