diff --git a/docs/config/production/hugo.toml b/docs/config/production/hugo.toml
index 25b668397..06ae0cafe 100644
--- a/docs/config/production/hugo.toml
+++ b/docs/config/production/hugo.toml
@@ -1,2 +1,2 @@
 # Overrides for production environment
-baseurl = "/"
+baseurl = "https://watermill.io/"
diff --git a/docs/layouts/partials/seo/opengraph.html b/docs/layouts/partials/seo/opengraph.html
index aa77c3c37..c8f5d67bb 100644
--- a/docs/layouts/partials/seo/opengraph.html
+++ b/docs/layouts/partials/seo/opengraph.html
@@ -4,7 +4,7 @@
 <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
 <meta property="og:url" content="{{ .Permalink }}">
 
-{{ $imagePermalink := (printf "https://academy-api.threedots.tech/ssr/image.png?%s" (collections.Querify "url" .Page.Permalink) ) }}
+{{ $imagePermalink := (printf "https://academy-api.threedots.tech/ssr/image.png?%s" (collections.Querify "url" .Permalink) ) }}
 <meta property="og:image" content="{{ $imagePermalink }}">
 
 {{- if .IsPage }}
diff --git a/docs/layouts/partials/seo/twitter.html b/docs/layouts/partials/seo/twitter.html
index e9ef42ef0..fe1dabeff 100644
--- a/docs/layouts/partials/seo/twitter.html
+++ b/docs/layouts/partials/seo/twitter.html
@@ -1,6 +1,6 @@
 {{/* Based on: https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates/twitter_cards.html */}}
 
-{{ $imagePermalink := (printf "https://academy-api.threedots.tech/ssr/image.png?%s" (collections.Querify "url" .Page.Permalink) ) }}
+{{ $imagePermalink := (printf "https://academy-api.threedots.tech/ssr/image.png?%s" (collections.Querify "url" .Permalink) ) }}
 <meta name="twitter:image" content="{{ $imagePermalink }}">
 <meta name="twitter:card" content="summary_large_image">