diff --git a/buildSrc/src/main/groovy/website/gradle/tasks/BlogTask.groovy b/buildSrc/src/main/groovy/website/gradle/tasks/BlogTask.groovy
index c0365a18807..7fd69f78c99 100644
--- a/buildSrc/src/main/groovy/website/gradle/tasks/BlogTask.groovy
+++ b/buildSrc/src/main/groovy/website/gradle/tasks/BlogTask.groovy
@@ -238,6 +238,7 @@ abstract class BlogTask extends GrailsWebsiteTask {
         }
 
         def metadata = htmlPost.metadata.toMap()
+        metadata['ogurl'] = postLink(htmlPost)
         html = RenderSiteTask.renderHtmlWithTemplateContent(html, metadata, templateText)
         html = RenderSiteTask.highlightMenu(html, metadata, htmlPost.path)
 
diff --git a/buildSrc/src/main/groovy/website/gradle/tasks/RenderSiteTask.groovy b/buildSrc/src/main/groovy/website/gradle/tasks/RenderSiteTask.groovy
index e58943d5353..4b20a6c7f73 100644
--- a/buildSrc/src/main/groovy/website/gradle/tasks/RenderSiteTask.groovy
+++ b/buildSrc/src/main/groovy/website/gradle/tasks/RenderSiteTask.groovy
@@ -176,7 +176,7 @@ abstract class RenderSiteTask extends GrailsWebsiteTask {
     ) {
         for (def page : listOfPages) {
             def resolvedMetadata = processMetadata(
-                    siteMeta + page.metadata
+                    siteMeta + page.metadata + [ogurl: siteMeta['url'] + page.path]
             )
             def html = renderHtmlWithTemplateContent(
                     page.content,
@@ -260,6 +260,17 @@ abstract class RenderSiteTask extends GrailsWebsiteTask {
                 )
             }
         }
+
+        if (!resolvedMetadata.containsKey('ogimage')) {
+            if (resolvedMetadata.containsKey('image')) {
+                resolvedMetadata.put('ogimage', resolvedMetadata['url'] + '/images/' + resolvedMetadata['image'])
+            } else if (resolvedMetadata.containsKey('video') && parseVideoId(resolvedMetadata)) {
+                String videoId = parseVideoId(resolvedMetadata)
+                resolvedMetadata.put('ogimage', "https://img.youtube.com/vi/${videoId}/maxresdefault.jpg".toString())
+            } else {
+                resolvedMetadata.put('ogimage', resolvedMetadata['url'] + '/images/grails.png')
+            }
+        }
         resolvedMetadata
     }
 
diff --git a/templates/document.html b/templates/document.html
index 066a6ca24f8..52f6253ad16 100644
--- a/templates/document.html
+++ b/templates/document.html
@@ -13,10 +13,8 @@
     <meta name='twitter:site' content='@grailsframework'/>
     <meta name='twitter:description' content='[%description]'/>
     <meta name='twitter:creator' content='@grailsframework'/>
-    <meta property='og:image' content='[%url]/images/grails.png'/>
-    <meta property='og:image:width' content='300'/>
-    <meta property='og:image:height' content='300'/>
-    <meta property='og:url' content='[%url]'/>
+    <meta property='og:image' content='[%ogimage]'/>
+    <meta property='og:url' content='[%ogurl]'/>
     <meta property='og:title' content='[%title]'/>
     <meta property='og:description' content='[%description]'/>
     <meta property='og:type' content='website'/>