diff --git a/templates/board.html b/templates/board.html
index e0f5cd6..4f95c6f 100644
--- a/templates/board.html
+++ b/templates/board.html
@@ -4,7 +4,7 @@
 
 {% block title %}{{ board.curator_name }} | {{ board.curator_title }} | {{ block.super }}{% endblock %}
 
-{% block meta_og %}
+{% block og_tags %}
     <meta property="og:title" content="{{ board.curator_name }} | {{ board.curator_title }}">
     <meta property="og:site_name" content="Infomate">
     <meta property="og:type" content="website">
diff --git a/templates/common/meta.html b/templates/common/meta.html
index bd0ca9c..ba9aac4 100644
--- a/templates/common/meta.html
+++ b/templates/common/meta.html
@@ -1,20 +1,4 @@
-{% load static %}
 <meta charset="UTF-8"/>
 <meta name="description" content="{{ settings.APP_DESCRIPTION }}">
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0">
 <meta name="format-detection" content="telephone=no">
-
-{% block meta_og %}
-    <meta property="og:title" content="{{ settings.APP_NAME }}">
-    <meta property="og:site_name" content="Infomate">
-    <meta property="og:url" content="{{ settings.APP_HOST }}">
-    <meta property="og:type" content="website" />
-    <meta property="og:description" content="{{ settings.APP_DESCRIPTION }}">
-    <meta property="og:image" content="{% static "images/cover.jpg" %}">
-
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:title" content="{{ settings.APP_NAME }}">
-    <meta name="twitter:description" content="{{ settings.APP_DESCRIPTION }}">
-    <meta name="twitter:image" content="{% static "images/cover.jpg" %}">
-    <meta name="twitter:creator" content="@vas3k">
-{% endblock %}
diff --git a/templates/common/og.html b/templates/common/og.html
new file mode 100644
index 0000000..48b2402
--- /dev/null
+++ b/templates/common/og.html
@@ -0,0 +1,13 @@
+{% load static %}
+<meta property="og:title" content="{{ settings.APP_NAME }}">
+<meta property="og:site_name" content="Infomate">
+<meta property="og:url" content="{{ settings.APP_HOST }}">
+<meta property="og:type" content="website" />
+<meta property="og:description" content="{{ settings.APP_DESCRIPTION }}">
+<meta property="og:image" content="{% static "images/cover.jpg" %}">
+
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:title" content="{{ settings.APP_NAME }}">
+<meta name="twitter:description" content="{{ settings.APP_DESCRIPTION }}">
+<meta name="twitter:image" content="{% static "images/cover.jpg" %}">
+<meta name="twitter:creator" content="@vas3k">
diff --git a/templates/layout.html b/templates/layout.html
index 92fe586..a0ea209 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -12,6 +12,9 @@
     {% block meta %}
         {% include "common/meta.html" %}
     {% endblock %}
+    {% block og_tags %}
+        {% include "common/og.html" %}
+    {% endblock %}
     {% include "common/favicon.html" %}
     {% include "common/css.html" %}
 </head>