diff --git a/roles/jitsi_jibri/tasks/cleanup.yml b/roles/jitsi_jibri/tasks/cleanup.yml
index 8ba9f9d..96f4c80 100644
--- a/roles/jitsi_jibri/tasks/cleanup.yml
+++ b/roles/jitsi_jibri/tasks/cleanup.yml
@@ -3,6 +3,6 @@
 - name: Remove tmp and obsolete files
   file: path={{ item }} state=absent
   loop:
-    - "{{ jitsi_root_dir }}/tmp/chromedriver_linux64.zip"
-    - "{{ jitsi_root_dir }}/tmp/chromedriver"
+    - "{{ jitsi_root_dir }}/tmp/chromedriver-linux64.zip"
+    - "{{ jitsi_root_dir }}/tmp/chromedriver-linux64"
   tags: jitsi
diff --git a/roles/jitsi_jibri/tasks/facts.yml b/roles/jitsi_jibri/tasks/facts.yml
index cd9adb0..c190ee2 100644
--- a/roles/jitsi_jibri/tasks/facts.yml
+++ b/roles/jitsi_jibri/tasks/facts.yml
@@ -23,13 +23,6 @@
   register: jitsi_jibri_jar
   tags: jitsi
 
-- name: Check latest version of ChromeDriver
-  uri:
-    url: https://chromedriver.storage.googleapis.com/LATEST_RELEASE
-    return_content: True
-  register: jitsi_jibri_chromedriver_latest_version
-  tags: jitsi
-
 - name: Check if ChromeDriver is installed
   stat: path=/usr/local/bin/chromedriver
   register: jitsi_jibri_chromedriver_bin
diff --git a/roles/jitsi_jibri/tasks/install.yml b/roles/jitsi_jibri/tasks/install.yml
index ff28244..57deb4e 100644
--- a/roles/jitsi_jibri/tasks/install.yml
+++ b/roles/jitsi_jibri/tasks/install.yml
@@ -55,27 +55,32 @@
   register: jitsi_jibri_git
   tags: jitsi
 
+- name: Get Chrome version
+  command: rpm -q google-chrome-stable --qf %{VERSION}
+  register: jitsi_jibri_chrome_version
+  tags: jitsi
+
 - name: Install or update ChromeDriver
   block:
     - name: Download ChromeDriver
       get_url:
-        url: http://chromedriver.storage.googleapis.com/{{ jitsi_jibri_chromedriver_latest_version.content }}/chromedriver_linux64.zip
+        url: https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/{{ jitsi_jibri_chrome_version.stdout }}/linux64/chromedriver-linux64.zip
         dest: "{{ jitsi_root_dir }}/tmp"
 
     - name: Extract ChromeDriver
       unarchive:
-        src: "{{ jitsi_root_dir }}/tmp/chromedriver_linux64.zip"
+        src: "{{ jitsi_root_dir }}/tmp/chromedriver-linux64.zip"
         dest: "{{ jitsi_root_dir }}/tmp"
         remote_src: True
 
     - name: Move ChromeDriver bin
       copy:
-        src: "{{ jitsi_root_dir }}/tmp/chromedriver"
+        src: "{{ jitsi_root_dir }}/tmp/chromedriver-linux64/chromedriver"
         dest: /usr/local/bin/chromedriver
         mode: 755
         remote_src: True
 
-  when: not jitsi_jibri_chromedriver_bin.stat.exists or jitsi_jibri_chromedriver_current_version.stdout != jitsi_jibri_chromedriver_latest_version.content
+  when: not jitsi_jibri_chromedriver_bin.stat.exists or jitsi_jibri_chromedriver_current_version.stdout != jitsi_jibri_chrome_version.stdout
   tags: jitsi
 
 - name: Install or update jibri
diff --git a/roles/jitsi_videobridge/tasks/cleanup.yml b/roles/jitsi_videobridge/tasks/cleanup.yml
index 773a836..f44fad9 100644
--- a/roles/jitsi_videobridge/tasks/cleanup.yml
+++ b/roles/jitsi_videobridge/tasks/cleanup.yml
@@ -3,6 +3,6 @@
 - name: Remove temp files
   file: path={{ item }} state=absent
   loop:
-    - "{{ jitsi_root_dir }}/tmp/jitsi-videobridge-2.1-SNAPSHOT"
+    - "{{ jitsi_root_dir }}/tmp/jitsi-videobridge-2.3-SNAPSHOT"
     - "{{ jitsi_root_dir }}/src/videobridge/target"
   tags: jitsi