diff --git a/roles/jitsi/tasks/facts.yml b/roles/jitsi/tasks/facts.yml
index 3e70bcd..4a7cb6c 100644
--- a/roles/jitsi/tasks/facts.yml
+++ b/roles/jitsi/tasks/facts.yml
@@ -1,40 +1,9 @@
 ---
 
-- name: Set initial install modes
-  block:
-    - set_fact: jitsi_videobridge_install_mode='none'
-    - set_fact: jitsi_videobridge_current_version=''
-  tags: jitsi
-
 - name: Set if jigasi is used
   set_fact: jitsi_jigasi={{ (jitsi_jigasi_sip_user is defined and jitsi_jigasi_sip_secret is defined) | ternary(True, False) }}
   tags: jitsi
 
-- name: Check if videobridge is installed
-  stat: path={{ jitsi_root_dir }}/meta/ansible_videobridge_version
-  register: jitsi_videobridge_version_file
-  tags: jitsi
-
-- block:
-    - name: Check installed version
-      slurp: src={{ jitsi_root_dir }}/meta/ansible_videobridge_version
-      register: jitsi_videobridge_current_version
-    - set_fact: jitsi_videobridge_current_version={{ jitsi_videobridge_current_version.content | b64decode | trim }}
-  when: jitsi_videobridge_version_file.stat.exists
-  tags: jitsi
-
-- name: Set upgrade mode
-  set_fact: jitsi_videobridge_install_mode='upgrade'
-  when:
-    - jitsi_videobridge_version_file.stat.exists
-    - jitsi_videobridge_current_version | string != jitsi_videobridge_version | string
-  tags: jitsi
-
-- name: Set videobridge install mode
-  set_fact: jitsi_videobridge_install_mode='install'
-  when: not jitsi_videobridge_version_file.stat.exists
-  tags: jitsi
-
 - name: Generate a random secret for videobridge
   block:
     - import_tasks: ../includes/get_rand_pass.yml
@@ -100,3 +69,27 @@
   when: jitsi_auth == 'ldap'
   tags: jisti
 
+- name: Check if cert file exist
+  stat: path={{ jitsi_cert_path }}
+  register: jitsi_cert_file
+  tags: jitsi
+
+- name: Check if key file exist
+  stat: path={{ jitsi_key_path }}
+  register: jitsi_key_file
+  tags: jitsi
+
+- name: Check if videobridge is built
+  stat: path={{ jitsi_root_dir }}/videobridge/jvb.sh
+  register: jitsi_videobridge_script
+  tags: jitsi
+
+- name: Check if jicofo is built
+  stat: path={{ jitsi_root_dir }}/jicofo/jicofo.sh
+  register: jitsi_jicofo_script
+  tags: jitsi
+
+- name: Check if jigasi is built
+  stat: path={{ jitsi_root_dir }}/jigasi/jigasi.sh
+  register: jitsi_jigasi_script
+  tags: jitsi
diff --git a/roles/jitsi/tasks/install.yml b/roles/jitsi/tasks/install.yml
index 866043c..5694b78 100644
--- a/roles/jitsi/tasks/install.yml
+++ b/roles/jitsi/tasks/install.yml
@@ -9,11 +9,6 @@
       - libXScrnSaver
   tags: jitsi
 
-- name: Check if cert file exist
-  stat: path={{ jitsi_cert_path }}
-  register: jitsi_cert_file
-  tags: jitsi
-
   # If you use an Let's Encrypt cert, it might not be there yet. In this case, create a link
   # to the default prosody cert so the service can be started. The cert will be obtained after that and
   # override the links
@@ -22,11 +17,6 @@
   when: not jitsi_cert_file.stat.exists
   tags: jitsi
 
-- name: Check if key file exist
-  stat: path={{ jitsi_key_path }}
-  register: jitsi_key_file
-  tags: jitsi
-
 - name: Link key to the default one
   file: path={{ jitsi_key_path }} src=/etc/prosody/certs/localhost.key state=link
   when: not jitsi_key_file.stat.exists
@@ -48,11 +38,6 @@
   register: jitsi_videobridge_git
   tags: jitsi
 
-- name: Check if videobridge is built
-  stat: path={{ jitsi_root_dir }}/videobridge/jvb.sh
-  register: jitsi_videobridge_script
-  tags: jitsi
-
 - name: Install or update videobridge
   block:
     - name: Build videobridge
@@ -88,11 +73,6 @@
   register: jitsi_jicofo_git
   tags: jitsi
 
-- name: Check if jicofo is built
-  stat: path={{ jitsi_root_dir }}/jicofo/jicofo.sh
-  register: jitsi_jicofo_script
-  tags: jitsi
-
 - name: Install or update jicofo
   block:
     - name: Build jicofo
@@ -127,11 +107,6 @@
   register: jitsi_jigasi_git
   tags: jitsi
 
-- name: Check if jigasi is built
-  stat: path={{ jitsi_root_dir }}/jigasi/jigasi.sh
-  register: jitsi_jigasi_script
-  tags: jitsi
-
 - name: Install or update jigasi
   block:
     - name: Build jigasi