diff --git a/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py b/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
index 562516c5ae9..a3577a35302 100644
--- a/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
+++ b/cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
@@ -27,6 +27,7 @@ from charmhelpers.contrib.charmsupport import nrpe
 from charms.reactive.helpers import data_changed
 
 from charms.layer import nginx
+from charms.layer import tls_client
 
 from subprocess import Popen
 from subprocess import PIPE
@@ -73,7 +74,7 @@ def kick_nginx(tls):
         # certificate changed, so sighup nginx
         hookenv.log("Certificate information changed, sending SIGHUP to nginx")
         host.service_restart('nginx')
-    remove_state('tls_client.server.certificate.written')
+    tls_client.reset_certificate_write_flag('server')
 
 
 @when('config.changed.port')
diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
index 291b8eeeddf..124c79520d1 100644
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -45,6 +45,8 @@ from charms.kubernetes.common import get_version
 from charms.kubernetes.common import retry
 from charms.kubernetes.flagmanager import FlagManager
 
+from charms.layer import tls_client
+
 from charmhelpers.core import hookenv
 from charmhelpers.core import host
 from charmhelpers.core import unitdata
@@ -568,7 +570,7 @@ def kick_api_server(tls):
         # certificate changed, so restart the api server
         hookenv.log("Certificate information changed, restarting api server")
         set_state('kube-apiserver.do-restart')
-    remove_state('tls_client.server.certificate.written')
+    tls_client.reset_certificate_write_flag('server')
 
 
 @when('kubernetes-master.components.started')