diff --git a/defaults/main.yml b/defaults/main.yml
index 51d8b03f..1deff435 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -42,6 +42,7 @@ galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}"
 
 # The major version used to select the repo URL path
 galera_major_version: 10.1
+galera_minor_version: 30
 
 # Set the URL for the MariaDB repository
 galera_repo_url: "{{ _galera_repo_url }}"
@@ -167,6 +168,11 @@ galera_server_distro_package_pins:
   - package: mariadb-server
     version: 10.1.27+maria-1~xenial
     priority: -1
+  # TODO(evrardjp): Remove pin when clustering issue is figured out
+  # Clustering issue
+  - package: mariadb-server
+    version: 10.1.31+maria-1~xenial
+    priority: -1
 
 # Galera Server SSL functionality.
 
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 781fc4af..aabb27fc 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -64,7 +64,8 @@ galera_server_upgrade_packages_remove:
 
 galera_mariadb_service_name: "mariadb"
 
-_galera_repo_url: "http://yum.mariadb.org/{{ galera_major_version }}/centos/7/x86_64"
+# TODO(evrardjp): Unfreeze version to 10.1 branch when clustering issue is solved.
+_galera_repo_url: "https://downloads.mariadb.com/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/centos7-amd64"
 _galera_repo:
   name: MariaDB
   description: "MariaDB Repo"
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index cae82633..2527ee4d 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -59,7 +59,8 @@ galera_server_upgrade_packages_remove:
 
 galera_mariadb_service_name: "mariadb"
 
-_galera_repo_url: "http://yum.mariadb.org/{{ galera_major_version }}/sles/12/x86_64"
+# TODO(evrardjp): Unfreeze version to 10.1 branch when clustering issue is solved.
+_galera_repo_url: "https://downloads.mariadb.com/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/yum/opensuse42-amd64"
 _galera_repo:
   name: MariaDB
   description: "MariaDB Repo"
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 1aa5c7fc..5672c01b 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -109,7 +109,8 @@ _galera_percona_xtrabackup_repo:
   state: "present"
   filename: "Percona"
 
-_galera_repo_url: "http://mirror.rackspace.com/mariadb/repo/{{ galera_major_version }}/ubuntu"
+# TODO(evrardjp): Unfreeze version to 10.1 branch when clustering issue is solved.
+_galera_repo_url: "https://downloads.mariadb.com/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/repo/ubuntu"
 _galera_repo:
   repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main"
   state: "present"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3cc5569a..ba7a3972 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -19,7 +19,10 @@
         - openstack-ansible-functional-centos-7
         - openstack-ansible-functional-opensuse-423
         - openstack-ansible-functional-ubuntu-xenial
-        - openstack-ansible-upgrade-ubuntu-xenial
+        # TODO(evrardjp): Reinstate this when all the 10.1.31
+        # issues patches have been merged in galera_server
+        # and galera_client
+        # - openstack-ansible-upgrade-ubuntu-xenial
         - openstack-ansible-ssl-ubuntu-xenial-nv
     experimental:
       jobs:
@@ -30,4 +33,7 @@
         - openstack-ansible-functional-centos-7
         - openstack-ansible-functional-opensuse-423
         - openstack-ansible-functional-ubuntu-xenial
-        - openstack-ansible-upgrade-ubuntu-xenial
+        # TODO(evrardjp): Reinstate this when all the 10.1.31
+        # issues patches have been merged in galera_server
+        # and galera_client
+        # - openstack-ansible-upgrade-ubuntu-xenial