diff --git a/lib/backend.py b/lib/backend.py
index b0d7c71ec1178ec64d0e47c2ca56749bbfb55dd5..24825c4c882e3e1e88e0772117db2660fd947ad8 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -375,6 +375,18 @@ def LeaveCluster():
   except errors.OpExecError:
     logging.exception("Error while processing ssh files")
 
+  try:
+    utils.RemoveFile(constants.HMAC_CLUSTER_KEY)
+    utils.RemoveFile(constants.RAPI_CERT_FILE)
+    utils.RemoveFile(constants.SSL_CERT_FILE)
+  except:
+    logging.exception("Error while removing cluster secrets")
+
+  confd_pid = utils.ReadPidFile(utils.DaemonPidFileName(constants.CONFD))
+
+  if confd_pid:
+    utils.KillProcess(confd_pid, timeout=2)
+
   # Raise a custom exception (handled in ganeti-noded)
   raise errors.QuitGanetiException(True, 'Shutdown scheduled')