diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml
index 3e0e6a5d11..be79de14d6 100644
--- a/playbooks/defaults/repo_packages/openstack_other.yml
+++ b/playbooks/defaults/repo_packages/openstack_other.yml
@@ -46,3 +46,8 @@ djangoopenstackauth_git_dest: "/opt/djangoopenstackauth_{{ djangoopenstackauth_g
 novncproxy_git_repo: https://github.com/kanaka/novnc
 novncproxy_git_install_branch: a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
+
+# spice-html5 from source
+spicehtml5_git_repo: https://github.com/SPICE/spice-html5
+spicehtml5_git_install_branch: c1e736b083ff47639ecb73ea9be4d14b5002f93f
+spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index da9a5ca973..31c806f0cf 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -114,6 +114,8 @@
     - role: "os_nova"
       nova_novncproxy_git_repo: "{{ openstack_repo_git_url }}/novnc"
       nova_novncproxy_git_install_branch: "{{ novncproxy_git_install_branch }}"
+      nova_spicehtml5_git_repo: "{{ openstack_repo_git_url }}/spice-html5"
+      nova_spicehtml5_git_install_branch: "{{ spicehtml5_git_install_branch }}"
       nova_galera_address: "{{ internal_lb_vip_address }}"
       tags:
         - "os-nova"
@@ -135,6 +137,8 @@
     - role: "system_crontab_coordination"
       tags:
         - "system-crontab-coordination"
+  vars_files:
+    - defaults/repo_packages/openstack_other.yml
   vars:
     galera_address: "{{ internal_lb_vip_address }}"
     ansible_hostname: "{{ container_name }}"
diff --git a/playbooks/roles/os_nova/defaults/main.yml b/playbooks/roles/os_nova/defaults/main.yml
index 562afb5394..8fbd313a39 100644
--- a/playbooks/roles/os_nova/defaults/main.yml
+++ b/playbooks/roles/os_nova/defaults/main.yml
@@ -165,6 +165,8 @@ nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto
 nova_spice_console_keymap: en-us
 nova_spice_console_agent_enabled: True
 nova_spice_program_name: nova-spicehtml5proxy
+nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5
+nova_spicehtml5_git_install_branch: master
 
 ## Nova novnc
 nova_novncproxy_proto: http
diff --git a/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml b/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml
index c98dfae179..966130dd5e 100644
--- a/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml
+++ b/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml
@@ -25,15 +25,29 @@
     - nova-apt-packages
     - nova-spice-apt-packages
 
-- name: Install apt packages
+- name: Remove apt packages
   apt:
     pkg: "{{ item }}"
-    state: latest
-  register: install_packages
-  until: install_packages|success
+    state: absent
+  register: remove_packages
+  until: remove_packages|success
   retries: 5
   delay: 2
   with_items: nova_spice_apt_packages
   tags:
     - nova-apt-packages
     - nova-spice-apt-packages
+
+- name: Get package from git
+  git:
+    repo: "{{ nova_spicehtml5_git_repo }}"
+    dest: "/usr/share/spice-html5"
+    clone: "yes"
+    update: "yes"
+    version: "{{ nova_spicehtml5_git_install_branch }}"
+  register: git_clone
+  until: git_clone|success
+  retries: 5
+  delay: 2
+  tags:
+    - nova-spice-git