diff --git a/handlers/main.yml b/handlers/main.yml
index b11c65a8b272ab4f0fede9b7de28b9133455e3db..4aece8a73c6766714ea6622dda362440a6f90ac4 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,3 +4,15 @@
   service:
     name: uwsgi
     state: restarted
+
+- name: Re-create the alerta ui container
+  docker_container:
+    name: alerta-beta
+    image: alerta/alerta-beta
+    state: started
+    recreate: yes
+    restart_policy: always
+    published_ports:
+      - 8999:80
+    volumes:
+      - /var/www/alerta/config.json:/usr/share/nginx/html/config.json
diff --git a/tasks/alerta.yml b/tasks/alerta.yml
index a02762eead51d076aff9246af976a576cfa32fa4..f4a46b6a6208ca6f2a5239421e4e80e52bfacf98 100644
--- a/tasks/alerta.yml
+++ b/tasks/alerta.yml
@@ -31,19 +31,24 @@
     - /var/www/alerta
     - /tmp/angular-alerta-webui-master
 
-# docker run -d -v "/var/www/alerta/config.json:/usr/share/nginx/html/config.json" --restart=always -it -p 8999:80 --name alerta-beta alerta/alerta-beta
+- name: Ensure directory for web UI
+  file:
+    path: '{{ item }}'
+    state: absent
+  with_items:
+    - /var/www/alerta
 
-- name: Download and extract web UI
-  unarchive:
-    src: 'https://github.com/alerta/angular-alerta-webui/archive/v{{ alerta_ui_version }}.zip'
-    dest: /tmp
-    remote_src: yes
+#- name: Download and extract web UI
+#  unarchive:
+#    src: 'https://github.com/alerta/angular-alerta-webui/archive/v{{ alerta_ui_version }}.zip'
+#    dest: /tmp
+#    remote_src: yes
 
-- name: Move new web UI
-  command: mv /tmp/angular-alerta-webui-{{ alerta_ui_version }}/app /var/www/alerta
-  args:
-    creates: /var/www/alerta
-    removes: /tmp/angular-alerta-webui-{{ alerta_ui_version }}/app
+#- name: Move new web UI
+#  command: mv /tmp/angular-alerta-webui-{{ alerta_ui_version }}/app /var/www/alerta
+#  args:
+#    creates: /var/www/alerta
+#    removes: /tmp/angular-alerta-webui-{{ alerta_ui_version }}/app
 
 - name: Copy wsgi.py
   template:
@@ -131,3 +136,13 @@
   copy:
     src: '{{ inventory_dir }}/files/favicon.ico'
     dest: /var/www/alerta/favicon.ico
+
+- name: Pull docker image
+  docker_image:
+    name: alerta/alerta-beta
+    source: pull
+    force_source: yes
+  notify:
+    - Re-create the alerta ui container
+  tags:
+    - ui