diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2
index e325565..ac2dcbd 100644
--- a/service/files/glance-api.conf.j2
+++ b/service/files/glance-api.conf.j2
@@ -40,12 +40,16 @@ rbd_store_ceph_conf = /etc/ceph/ceph.conf
 {% elif glance.swift.enable %}
 stores = http,swift
 default_store = swift
+swift_store_multi_tenant = True
 swift_store_create_container_on_put = {{ glance.swift.store_create_container_on_put }}
 swift_store_region = RegionOne
 default_swift_reference = swift
 swift_store_container = {{ glance.swift.store_container }}
 swift_store_config_file = /etc/glance/glance-swift-store.conf
 swift_store_auth_insecure = {{ glance.swift.store_auth_insecure }}
+{% if security.tls.create_certificates %}
+swift_store_cacert = /opt/ccp/etc/tls/ca.pem
+{% endif %}
 {% else %}
 stores = http,file
 default_store = file