diff --git a/tasks/consoles/nova_console_novnc_install.yml b/tasks/consoles/nova_console_novnc_install.yml
index bfcddba9..a1347d0f 100644
--- a/tasks/consoles/nova_console_novnc_install.yml
+++ b/tasks/consoles/nova_console_novnc_install.yml
@@ -35,6 +35,7 @@
   register: existing_dir_cleanup
   changed_when: existing_dir_cleanup.rc == 2
   failed_when: existing_dir_cleanup.rc not in [0,2]
+  when: nova_install_method == 'source'
   tags:
     - nova-novnc-git
 
@@ -51,6 +52,7 @@
   until: git_clone is success
   retries: 5
   delay: 2
+  when: nova_install_method == 'source'
   notify:
     - Manage LB
     - Restart nova services
diff --git a/tasks/consoles/nova_console_spice_install.yml b/tasks/consoles/nova_console_spice_install.yml
index 8436b27c..feadae41 100644
--- a/tasks/consoles/nova_console_spice_install.yml
+++ b/tasks/consoles/nova_console_spice_install.yml
@@ -35,6 +35,7 @@
   register: existing_dir_cleanup
   changed_when: existing_dir_cleanup.rc == 2
   failed_when: existing_dir_cleanup.rc not in [0,2]
+  when: nova_install_method == 'source'
   tags:
     - nova-spice-git
 
@@ -51,6 +52,7 @@
   until: git_clone is success
   retries: 5
   delay: 2
+  when: nova_install_method == 'source'
   notify:
     - Manage LB
     - Restart nova services
diff --git a/vars/debian.yml b/vars/debian.yml
index b5e1b093..e34aaff0 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -42,9 +42,12 @@ nova_service_extra_distro_packages:
   kvm:
     - nova-compute-kvm
   novnc:
-    - nova-novncproxy
+    - novnc
+  nova_api:
+    - uwsgi
+    - uwsgi-plugin-python3
   spice:
-    - nova-spiceproxy
+    - spice-html5
   serialconsole:
     - openstack-nova-serialproxy