diff --git a/Doc/conf.py b/Doc/conf.py
index 467961dd5e2bff..a60006d61a3112 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -630,13 +630,11 @@
     'image': '_static/og-image.png',
     'line_color': '#3776ab',
 }
-ogp_custom_meta_tags = [
-    '<meta name="theme-color" content="#3776ab">',
-]
 if 'create-social-cards' not in tags:  # noqa: F821
     # Define a static preview image when not creating social cards
     ogp_image = '_static/og-image.png'
-    ogp_custom_meta_tags += [
-        '<meta property="og:image:width" content="200">',
-        '<meta property="og:image:height" content="200">',
+    ogp_custom_meta_tags = [
+        # Self-closing for EPUB validity
+        '<meta property="og:image:width" content="200" />',
+        '<meta property="og:image:height" content="200" />',
     ]
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index 1cb0200822d9fe..544db562097f29 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -31,6 +31,7 @@
       <script defer data-domain="docs.python.org" src="https://analytics.python.org/js/script.outbound-links.js"></script>
       {% endif %}
       <link rel="canonical" href="https://docs.python.org/3/{{pagename}}.html">
+      <meta name="theme-color" content="#3776ab">
       {% if pagename == 'whatsnew/changelog' and not embedded %}
       <script type="text/javascript" src="{{ pathto('_static/changelog_search.js', 1) }}"></script>{% endif %}
     {% endif %}