diff --git a/templates/partials/header.html b/templates/partials/header.html
index f2868eaa8..c349c7ca1 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -40,14 +40,14 @@
                     <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 current_url is starting_with("www_threefold_io") %}
-                    {% set path = current_url ~ link_path[1] %}
+                    {% elif base is containing("www_threefold_io") %}
+                    {% set path = 'www_threefold_io' ~ 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}}
+                      {{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">
-                        {{link_label}}
+                      {{link_label}}
                     </a>
                     {% endif %}
                 {% else %}
@@ -174,8 +174,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 current_url is starting_with("www_threefold_io") %}
-                                {% set path = current_url ~ link_path[1] %}
+                                {% elif base is containing("www_threefold_io") %}
+                                {% set path = 'www_threefold_io' ~ 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>
diff --git a/templates/shortcodes/cloud_header.html b/templates/shortcodes/cloud_header.html
index 3a8e60353..2b26d47bc 100644
--- a/templates/shortcodes/cloud_header.html
+++ b/templates/shortcodes/cloud_header.html
@@ -9,7 +9,9 @@
         </div>
         <div class="mb-4">
             {% if base is containing("www_threefold_io") %}
-            <img class="mx-auto sm:w-1/2 lg:w-full" src="www_threefold_io/images/cloud_header_seprated.png" alt="TF Cloud" />
+            {% set path = base ~ '/' ~ 'images/cloud_header_seprated.png' %}
+
+            <img class="mx-auto sm:w-1/2 lg:w-full" src="{{path}}" alt="TF Cloud" />
             {% else %}
             <img class="mx-auto sm:w-1/2 lg:w-full" src="images/cloud_header_seprated.png" alt="TF Cloud" />
             {% endif %}