diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 99a33ea..b3ea859 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -186,6 +186,7 @@
     server:
       barbican:
         enabled: ${_param:barbican_integration_enabled}
-  heat:
-    server:
-      reauthentication_auth_method: 'trusts'
+  # Uncomment when https://mirantis.jira.com/browse/PROD-27759 is fixed
+  #heat:
+  #  server:
+  #    reauthentication_auth_method: 'trusts'