diff --git a/docs/.sphinx/_templates/footer.html b/docs/.sphinx/_templates/footer.html
index f13cb631..31c1c871 100644
--- a/docs/.sphinx/_templates/footer.html
+++ b/docs/.sphinx/_templates/footer.html
@@ -71,6 +71,7 @@
     {%- endif %}
   </div>
   <div class="right-details">
+    <a href="" class="js-revoke-cookie-manager muted-link">Manage your tracker settings</a>
 
     {# mod: replaced RTD icons with our links #}
 
diff --git a/docs/.sphinx/_templates/header.html b/docs/.sphinx/_templates/header.html
index 1de9733b..d9dc90fe 100644
--- a/docs/.sphinx/_templates/header.html
+++ b/docs/.sphinx/_templates/header.html
@@ -1,5 +1,23 @@
 <header id="header" class="p-navigation">
 
+  <!-- Google Tag Manager -->
+  <script>
+  (function(w, d, s, l, i) {
+    w[l] = w[l] || [];
+    w[l].push({
+      'gtm.start': new Date().getTime(),
+      event: 'gtm.js'
+    });
+    var f = d.getElementsByTagName(s)[0],
+      j = d.createElement(s),
+      dl = l != 'dataLayer' ? '&l=' + l : '';
+    j.async = true;
+    j.src =
+      'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+    f.parentNode.insertBefore(j, f);
+  })(window, document, 'script', 'dataLayer', 'GTM-KNX3CJC');
+  </script>
+
   <div class="p-navigation__nav" role="menubar">
 
     <ul class="p-navigation__links" role="menu">
diff --git a/docs/.sphinx/requirements.txt b/docs/.sphinx/requirements.txt
index f5a1d8c3..80957fb7 100644
--- a/docs/.sphinx/requirements.txt
+++ b/docs/.sphinx/requirements.txt
@@ -12,3 +12,5 @@ sphinx-reredirects
 sphinx-tabs
 sphinxcontrib-jquery
 sphinxext-opengraph
+sphinx-version-warning
+sphinx_sitemap
diff --git a/docs/_static/js/overwrite_links.js b/docs/_static/js/overwrite_links.js
new file mode 100644
index 00000000..06ebed82
--- /dev/null
+++ b/docs/_static/js/overwrite_links.js
@@ -0,0 +1,38 @@
+ // Replace oldDomain with newDomain
+const oldDomain = 'canonical-microcephcanonicalcom.readthedocs-hosted.com/';
+const newDomain = 'canonical.com/ceph/docs/';
+
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function overwriteMatchingAnchorUrls(container) {
+    if (!container) return;
+
+    const anchors = container.querySelectorAll('a[href], link[href]');
+    const oldDomainRegex = new RegExp(escapeRegExp(oldDomain), 'g');
+
+    anchors.forEach(anchor => {
+        anchor.href = anchor.href.replace(oldDomainRegex, newDomain);
+    });
+}
+
+overwriteMatchingAnchorUrls(document.querySelector('header'));
+
+// Use a MutationObserver to wait for the RTD flyout element to appear in the DOM
+const observer = new MutationObserver(function(mutations, obs) {
+
+    const rtdFlyout = document.querySelector('readthedocs-flyout');
+    if (!rtdFlyout) return;
+
+    obs.disconnect();
+
+    rtdFlyout.addEventListener('click', function() {
+        const shadowRoot = rtdFlyout.shadowRoot;
+        if (!shadowRoot) return;
+
+        overwriteMatchingAnchorUrls(shadowRoot);
+    });
+});
+
+observer.observe(document.body, { childList: true, subtree: true });
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index 3292d812..eab4c5bf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -27,7 +27,8 @@
     'sphinxext.opengraph',
     'myst_parser',
     'sphinxcontrib.jquery',
-    'notfound.extension'
+    'notfound.extension',
+    'sphinx_sitemap'
 ]
 extensions.extend(custom_extensions)
 
@@ -123,7 +124,7 @@
 ### Additional files
 ############################################################
 
-html_static_path = ['.sphinx/_static']
+html_static_path = ['.sphinx/_static', '_static']
 
 html_css_files = [
     'custom.css',
diff --git a/docs/custom_conf.py b/docs/custom_conf.py
index 4d6aebcb..dfebc57f 100644
--- a/docs/custom_conf.py
+++ b/docs/custom_conf.py
@@ -1,4 +1,5 @@
 import datetime
+import os
 
 # Custom configuration for the Sphinx documentation builder.
 # All configuration specific to your project should be done in this file.
@@ -41,7 +42,8 @@
 
 ## Open Graph configuration - defines what is displayed in the website preview
 # The URL of the documentation output
-ogp_site_url = 'https://canonical-starter-pack.readthedocs-hosted.com/'
+version_slug = f"{os.environ.get('READTHEDOCS_VERSION', 'local')}"
+ogp_site_url = f"https://canonical.com/ceph/docs/{version_slug}/"
 # The documentation website name (usually the same as the product name)
 ogp_site_name = project
 # An image or logo that is used in the preview
@@ -89,7 +91,16 @@
 
 # If your project is on documentation.ubuntu.com, specify the project
 # slug (for example, "lxd") here.
-slug = ""
+slug = 'ceph/docs'
+
+# Base URL and sitemap configuration
+html_baseurl = f"https://canonical.com/ceph/docs/{version_slug}/"
+sitemap_filename = "doc-sitemap.xml"
+
+if 'READTHEDOCS_VERSION' in os.environ:
+    sitemap_url_scheme = '{version}{link}'
+else:
+    sitemap_url_scheme = '{link}'
 
 ############################################################
 ### Redirects
@@ -136,10 +147,10 @@
 ]
 
 # Add CSS files (located in .sphinx/_static/)
-custom_html_css_files = []
+custom_html_css_files = ['https://assets.ubuntu.com/v1/d86746ef-cookie_banner.css']
 
 # Add JavaScript files (located in .sphinx/_static/)
-custom_html_js_files = []
+custom_html_js_files = ['https://assets.ubuntu.com/v1/287a5e8f-bundle.js']
 
 ## The following settings override the default configuration.
 
diff --git a/microceph/ceph/services.go b/microceph/ceph/services.go
index d2393e34..07f2d35c 100644
--- a/microceph/ceph/services.go
+++ b/microceph/ceph/services.go
@@ -217,6 +217,15 @@ func removeServiceDatabase(s interfaces.StateInterface, service string) error {
 			return fmt.Errorf("failed to remove service from db %q: %w", service, err)
 		}
 
+		// Clear mon host entry from config table.
+		if service == "mon" {
+			key := fmt.Sprintf("mon.host.%s", s.ClusterState().Name())
+			err = database.DeleteConfigItem(ctx, tx, key)
+			if err != nil {
+				return err
+			}
+		}
+
 		return nil
 	})
 	return err