diff --git a/templates/partials/header.html b/templates/partials/header.html
index 0b7a5934a..a424be16e 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -1,15 +1,13 @@
 {%- set section = get_section(path="header/_index.md") %}
 {% set header_items = section.content | safe | split(pat="<li>") %}
-{% set base = config.base_url %}
-{% set logo_path = base ~ '/' ~ section.extra.logoPath %}
 
 <header id="header-container">
     <div class="z-10 bg-white fixed w-full top-0">
         <div class="relative z-50 shadow">
         <div class="mx-auto flex z-50 shadow justify-between items-center px-6 sm:px-4 md:px-6 py-2 lg:px-5 lg:justify-start space-x-10 sm:space-x-4 ">
             <div>
-                <a href="{{base}}" class="flex">
-                    <img class="w-20 h-auto sm:w-15" style="max-width: none;" src="{{logo_path}}" alt="ThreeFold Logo" />
+                <a href="{{get_url(path='/')}}" class="flex">
+                    <img class="w-20 h-auto sm:w-15" style="max-width: none;" src="{{ get_url(path=section.extra.logoPath)}}" alt="ThreeFold Logo" />
                 </a>
             </div>
             <div class="-mr-2 -my-2 lg:hidden">
@@ -40,13 +38,8 @@
                     <a href="{{link_path[1]}}" target="_blank" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                         {{link_label}}
                     </a>
-                    {% elif base is containing("www_threefold_io") %}
-                    {% set path = base ~ link_path[1] %}
-                    <a href="{{path}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
-                      {{link_label}}
-                    </a>
                     {% else %}
-                    <a href="{{link_path[1]}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+                    <a href="{{ get_url(path=link_path[1])}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
                       {{link_label}}
                     </a>
                     {% endif %}
@@ -110,9 +103,8 @@
                   </ul>
                   <div class="rounded-full border-2 mt-1 border-gray-400">
                     <a href="https://gettft.com/gettft/" target="_blank" class="mt-2">
-                      {% set btn_path = base ~ section.extra.button_Path %}
                       <img
-                        src="{{ btn_path }}"
+                        src="{{ get_url(path=section.extra.button_Path) }}"
                         class="mr-5"
                         style="max-width: none;"
                         alt=""
@@ -174,13 +166,8 @@
                                 <a href="{{link_path[1]}}" target="_blank" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
                                     {{link_label}}
                                 </a>
-                                {% elif base is containing("www_threefold_io") %}
-                                {% set path = base ~ link_path[1] %}
-                                <a href="{{path}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
-                                    {{link_label}}
-                                </a>
                                 {% else %}
-                                <a href="{{link_path[1]}}" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
+                                <a href="{{ get_url(path=link_path[1])}}" class="text-lg px-8 py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
                                     {{link_label}}
                                 </a>
                                 {% endif %}
@@ -203,7 +190,7 @@
                     {%- set logoPath = section.extra.logoPath %}
                     <div class="mx-8 mt-8">
                         <div class="space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
-                          <img class="w-32 h-auto" src="{{logoPath}}" alt="Company name" />
+                          <img class="w-32 h-auto" src="{{get_url(path=logoPath)}}" alt="Company name" />
                           <p class="text-gray-500 text-base leading-6 ">
                             {{section.description}}
                           </p>