diff --git a/_includes/head.html b/_includes/head.html
index 13bbe2bd..0c1e3a73 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -9,7 +9,7 @@
   <meta name="msapplication-TileImage" content="/assets/img/favicons/mstile-144x144.png">
   <meta name="msapplication-config" content="/assets/img/favicons/browserconfig.xml">
   <meta name="theme-color" content="#ffffff">
-  <link rel="canonical" href="{{ site.production_url }}{{ page.url | replace:'index.html',''}}">
+  <link rel="canonical" href="{{ site.production_url }}{{ page.src_dir | replace:'index.html',''}}">
   {% hreflang %}
 
   <!-- title -->
diff --git a/_plugins/hreflang-tag.rb b/_plugins/hreflang-tag.rb
index 4aeae1fd..d86ad484 100644
--- a/_plugins/hreflang-tag.rb
+++ b/_plugins/hreflang-tag.rb
@@ -28,10 +28,10 @@ module Jekyll
 
       if page["translate"]
         dir       = page["src_dir"].nil? ? page["dir"] : page["src_dir"]
-        hreflangs = %{<link rel="alternate" hreflang="en" href="#{site.config["url"]}#{dir}" />}
+        hreflangs = %{<link rel="alternate" hreflang="en" href="#{site.config["production_url"]}#{dir}" />}
 
         site.data["languages"].each_key do |language|
-          hreflangs << %{<link rel="alternate" hreflang="#{language.tr('_', '-')}" href="#{site.config["url"]}/#{language}#{dir}" />}
+          hreflangs << %{<link rel="alternate" hreflang="#{language.tr('_', '-')}" href="#{site.config["production_url"]}/#{language}#{dir}" />}
         end
       end