diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html
index b73cfd4d..ada256e0 100644
--- a/allianceauth/authentication/templates/public/base.html
+++ b/allianceauth/authentication/templates/public/base.html
@@ -6,13 +6,8 @@
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="">
-        <meta name="author" content="">
-        <!-- TODO Bundle all the site specific stuff up into its own template for easy override -->
-        <meta property="og:title" content="{{ SITE_NAME }}">
-        <meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
-        <meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">
 
+        {% include 'allianceauth/opengraph.html' %}
         {% include 'allianceauth/icons.html' %}
 
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html
index a26531e7..1eba9aea 100644
--- a/allianceauth/templates/allianceauth/base-bs5.html
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@@ -12,11 +12,10 @@
         <!-- End Required meta tags -->
 
         <!-- Meta tags -->
-        <!-- TODO Bundle all the site specific stuff up into its own template for easy override -->
-        <meta name="description" content="">
-        <meta name="author" content="">
+        {% include 'allianceauth/opengraph.html' %}
         {% include 'allianceauth/icons.html' %}
         <!-- Meta tags -->
+
         <title>{% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %}</title>
 
         {% theme_css %}
diff --git a/allianceauth/templates/allianceauth/opengraph.html b/allianceauth/templates/allianceauth/opengraph.html
new file mode 100644
index 00000000..b7b0d682
--- /dev/null
+++ b/allianceauth/templates/allianceauth/opengraph.html
@@ -0,0 +1,5 @@
+{% load static %}
+
+<meta property="og:title" content="{{ SITE_NAME }}">
+<meta property="og:image" content="{{ SITE_URL }}{% static 'allianceauth/icons/apple-touch-icon.png' %}">
+<meta property="og:description" content="Alliance Auth - An auth system for EVE Online to help in-game organizations manage online service access.">