diff --git a/jekyll-assets/_includes/head.html b/jekyll-assets/_includes/head.html
index 99f6bf9a0a..4bb534519d 100644
--- a/jekyll-assets/_includes/head.html
+++ b/jekyll-assets/_includes/head.html
@@ -1,8 +1,8 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>{{ page.title }}</title>
-<meta property="og:title" content="{{ page.title }}">
+<title>{{ site.title }} - {{ page.title }}</title>
+<meta property="og:title" content="{{ site.title }} - {{ page.title }}">
 <meta property="og:description" content="The official documentation for Raspberry Pi computers and microcontrollers">
 <meta property="og:url" content="https://www.raspberrypi.org{{ page.url | relative_url }}">
 <meta property="og:image" content="https://www.raspberrypi.org{{ "/images/opensocial.png" | relative_url }}">
diff --git a/scripts/create_build_adoc.py b/scripts/create_build_adoc.py
index c6796ab712..1b0f233d46 100755
--- a/scripts/create_build_adoc.py
+++ b/scripts/create_build_adoc.py
@@ -30,7 +30,7 @@
         out_fh.write(""":parentdir: {}
 :page-layout: docs
 :includedir: {}
-:doctitle: Raspberry Pi Documentation - {}
+:doctitle: {}
 
 include::{{includedir}}/{{parentdir}}/{}[]
 """.format(output_path, src_dir, index_title, adoc_filename))
diff --git a/scripts/create_jekyll_ninjabuild.py b/scripts/create_jekyll_ninjabuild.py
index 1c2aa6eb7b..41cfa8798f 100755
--- a/scripts/create_jekyll_ninjabuild.py
+++ b/scripts/create_jekyll_ninjabuild.py
@@ -38,7 +38,7 @@ def scan_adoc(adoc_filename, apparent_filename):
     output_dir = sys.argv[3]
     output_ninjabuild = sys.argv[4]
 
-    category_pages = set([('index.adoc', 'Raspberry Pi Documentation')])
+    category_pages = set([('index.adoc', 'Index')])
     doc_pages = set()
     page_images = set()
 
@@ -50,7 +50,7 @@ def scan_adoc(adoc_filename, apparent_filename):
             assert ('path' in tab) == ('subitems' in tab)
             if 'path' in tab:
                 # category (boxes) page
-                category_pages.add((os.path.join(tab['path'], 'index.adoc'), 'Raspberry Pi Documentation - {}'.format(tab['title'])))
+                category_pages.add((os.path.join(tab['path'], 'index.adoc'), tab['title']))
                 # build_adoc
                 for subitem in tab['subitems']:
                     if 'subpath' in subitem: