diff --git a/kolla/image/build.py b/kolla/image/build.py
index efb11f9639..0a3ed999b5 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -127,6 +127,7 @@ class Status(Enum):
 
     'centos': {
         "hacluster-pcs",         # Missing crmsh package
+        "monasca-grafana",       # Too old Ruby now and not supported well
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
         "tgtd",                  # Not supported on CentOS 8
@@ -349,9 +350,14 @@ def push_image(self, image):
 
         # Since docker 3.0.0, the argument of 'insecure_registry' is removed.
         # To be compatible, set 'insecure_registry=True' for old releases.
-        dc_running_ver = StrictVersion(docker.version)
-        if dc_running_ver < StrictVersion('3.0.0'):
-            kwargs['insecure_registry'] = True
+        # NOTE(frickler): The version check will fail for docker >= 6.0, but
+        # in that case we know that the workaround isn't needed.
+        try:
+            dc_running_ver = StrictVersion(docker.version)
+            if dc_running_ver < StrictVersion('3.0.0'):
+                kwargs['insecure_registry'] = True
+        except TypeError:
+            pass
 
         for response in self.dc.push(image.canonical_name, **kwargs):
             if 'stream' in response:
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index fa7c0a7d50..878dd701cb 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -54,7 +54,7 @@ debian:
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/debian buster main"
+  mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/debian buster main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
@@ -66,7 +66,7 @@ debian-aarch64:
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
-  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/debian buster main"
+  mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/debian buster main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
@@ -77,7 +77,7 @@ ubuntu:
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
+  mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/ubuntu focal main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
@@ -88,7 +88,7 @@ ubuntu-aarch64:
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
+  mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/ubuntu bionic main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
 
diff --git a/releasenotes/notes/docker-6-6d77b5ff7ec1daef.yaml b/releasenotes/notes/docker-6-6d77b5ff7ec1daef.yaml
new file mode 100644
index 0000000000..f666813255
--- /dev/null
+++ b/releasenotes/notes/docker-6-6d77b5ff7ec1daef.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes problems when running with docker-py >=6.
+    `LP#1988121 <https://launchpad.net/bugs/1988121>`__