diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml
index 64c087081e..2e48ad1975 100644
--- a/etc/kayobe/cephadm.yml
+++ b/etc/kayobe/cephadm.yml
@@ -12,7 +12,7 @@ cephadm_ceph_release: "squid"
 cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
 
 # Ceph container image tag.
-cephadm_image_tag: "v19.2.1"
+cephadm_image_tag: "v19.2.2"
 
 # HAProxy container image.
 cephadm_haproxy_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/haproxy:{{ cephadm_haproxy_image_tag }}"
diff --git a/etc/kayobe/environments/ci-multinode/kolla/globals.yml b/etc/kayobe/environments/ci-multinode/kolla/globals.yml
index 2fe551d8db..a8fc7a0c65 100644
--- a/etc/kayobe/environments/ci-multinode/kolla/globals.yml
+++ b/etc/kayobe/environments/ci-multinode/kolla/globals.yml
@@ -15,6 +15,10 @@ kolla_enable_tls_backend: "yes"
 # Enable RabbitMQ TLS
 rabbitmq_enable_tls: "yes"
 
+# Disable database TLS
+database_enable_tls_internal: false
+database_enable_tls_backend: false
+
 ############################################################################
 # Most development environments will use nested virtualisation, and we can't
 # guarantee that nested KVM support is available. Use QEMU as a lowest common
@@ -67,3 +71,6 @@ designate_forwarders_addresses: "1.1.1.1; 8.8.8.8"
 # Open up ports in firewalld for services on the public API network.
 enable_external_api_firewalld: true
 external_api_firewalld_zone: "{{ public_net_name | net_zone }}"
+
+# Test cinder cluster
+cinder_cluster_name: "stackhpc_test_cinder_cluster"
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index b0d4547d29..ad4516c5b5 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -149,7 +149,7 @@ stackhpc_kolla_source_version: stackhpc/20.1.0.3
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.2
+stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.4
 
 ###############################################################################
 # Container image registry