diff --git a/_includes/disqus.html b/_includes/disqus.html
index 4b4b149..a750c27 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -13,16 +13,16 @@
   </p>
 </div>
 
-<script src="{{ site.baseurl }}/assets/js/lib/jquery.disqusloader.min.js"></script>
+<script src="{{ '/assets/js/lib/jquery.disqusloader.min.js' | relative_url }}"></script>
 <script>
   var options = {
     scriptUrl: '//{{ site.disqus.shortname }}.disqus.com/embed.js',
 
     disqusConfig: function() {
-      this.page.url = '{{ site.url | append: site.baseurl | append: page.url }}';
+      this.page.url = '{{ page.url | absolute_url }}';
       this.page.identifier = '{{ page.url }}';
     }
   };
 
   $.disqusLoader('#disqus', options);
-</script>
\ No newline at end of file
+</script>
diff --git a/_includes/post-sharing.html b/_includes/post-sharing.html
index 04e41ee..e71049e 100644
--- a/_includes/post-sharing.html
+++ b/_includes/post-sharing.html
@@ -11,7 +11,7 @@
   <span class="share-label text-muted mr-1">{{ site.data.share.label }}</span>
   <span class="share-icons">
     {% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %}
-    {% assign url = page.url | relative_url | prepend: site.url %}
+    {% assign url = page.url | absolute_url %}
 
     {% for share in site.data.share.platforms %}
       {% assign link = share.link | replace: 'TITLE', title | replace: 'URL', url %}
diff --git a/_includes/search-loader.html b/_includes/search-loader.html
index af7ebb1..1c2565e 100644
--- a/_includes/search-loader.html
+++ b/_includes/search-loader.html
@@ -25,8 +25,8 @@
 SimpleJekyllSearch({
   searchInput: document.getElementById('search-input'),
   resultsContainer: document.getElementById('search-results'),
-  json: '{{ site.baseurl }}/assets/js/data/search.json',
+  json: '{{ '/assets/js/data/search.json' | relative_url }}',
   searchResultTemplate: '{{ result_elem | strip_newlines }}',
   noResultsText: '{{ not_found }}'
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/robots.txt b/robots.txt
index ad4a840..997ca7c 100644
--- a/robots.txt
+++ b/robots.txt
@@ -12,4 +12,4 @@ User-agent: *
 
 Disallow: /norobots/
 
-Sitemap: {{ site.url | append: site.baseurl }}/sitemap.xml
\ No newline at end of file
+Sitemap: {{ '/sitemap.xml' | absolute_url }}