diff --git a/contrail-agent/hooks/contrail_agent_hooks.py b/contrail-agent/hooks/contrail_agent_hooks.py
index 873832c..3b02e5a 100755
--- a/contrail-agent/hooks/contrail_agent_hooks.py
+++ b/contrail-agent/hooks/contrail_agent_hooks.py
@@ -15,6 +15,7 @@
     related_units,
     status_set,
     unit_private_ip,
+    local_unit,
 )
 
 import contrail_agent_utils as utils
@@ -155,6 +156,8 @@ def _update_tls(rid=None):
 
 @hooks.hook('tls-certificates-relation-joined')
 def tls_certificates_relation_joined():
+    # in cross-model rellations we have to provide own name to be sure that we'll find it in response
+    relation_set(unit_name=local_unit().replace('/', '_'))
     _update_tls(rid=relation_id())
 
 
diff --git a/contrail-analytics/hooks/contrail_analytics_hooks.py b/contrail-analytics/hooks/contrail_analytics_hooks.py
index bb87028..3e80e33 100755
--- a/contrail-analytics/hooks/contrail_analytics_hooks.py
+++ b/contrail-analytics/hooks/contrail_analytics_hooks.py
@@ -234,6 +234,8 @@ def _update_tls(rid=None):
 
 @hooks.hook('tls-certificates-relation-joined')
 def tls_certificates_relation_joined():
+    # in cross-model rellations we have to provide own name to be sure that we'll find it in response
+    relation_set(unit_name=local_unit().replace('/', '_'))
     _update_tls(rid=relation_id())
 
 
diff --git a/contrail-analyticsdb/hooks/contrail_analyticsdb_hooks.py b/contrail-analyticsdb/hooks/contrail_analyticsdb_hooks.py
index d3f2a52..dcaba79 100755
--- a/contrail-analyticsdb/hooks/contrail_analyticsdb_hooks.py
+++ b/contrail-analyticsdb/hooks/contrail_analyticsdb_hooks.py
@@ -187,6 +187,8 @@ def _update_tls(rid=None):
 
 @hooks.hook('tls-certificates-relation-joined')
 def tls_certificates_relation_joined():
+    # in cross-model rellations we have to provide own name to be sure that we'll find it in response
+    relation_set(unit_name=local_unit().replace('/', '_'))
     _update_tls(rid=relation_id())
 
 
diff --git a/contrail-controller/hooks/contrail_controller_hooks.py b/contrail-controller/hooks/contrail_controller_hooks.py
index 4408455..4ded5f2 100755
--- a/contrail-controller/hooks/contrail_controller_hooks.py
+++ b/contrail-controller/hooks/contrail_controller_hooks.py
@@ -568,6 +568,8 @@ def _update_tls(rid=None):
 
 @hooks.hook('tls-certificates-relation-joined')
 def tls_certificates_relation_joined():
+    # in cross-model rellations we have to provide own name to be sure that we'll find it in response
+    relation_set(unit_name=local_unit().replace('/', '_'))
     _update_tls(rid=relation_id())
 
 
diff --git a/contrail-kubernetes-master/hooks/contrail_kubernetes_master_hooks.py b/contrail-kubernetes-master/hooks/contrail_kubernetes_master_hooks.py
index 5aced98..a7dc087 100755
--- a/contrail-kubernetes-master/hooks/contrail_kubernetes_master_hooks.py
+++ b/contrail-kubernetes-master/hooks/contrail_kubernetes_master_hooks.py
@@ -322,6 +322,8 @@ def _update_tls(rid=None):
 
 @hooks.hook('tls-certificates-relation-joined')
 def tls_certificates_relation_joined():
+    # in cross-model rellations we have to provide own name to be sure that we'll find it in response
+    relation_set(unit_name=local_unit().replace('/', '_'))
     _update_tls(rid=relation_id())