diff --git a/templates/partials/header.html b/templates/partials/header.html
index f4d8b1645..e56ebbb50 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -40,7 +40,7 @@
                     <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 containing("www_threefold_io") %}
+                    {% elif header_label is starting_with("/") %}
                     {% set path = current_url ~ 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}}
@@ -174,7 +174,7 @@
                                 <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 containing("www_threefold_io") %}
+                                {% elif header_label is starting_with("/") %}
                                 {% set path = current_url ~ 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}}
diff --git a/templates/shortcodes/button.html b/templates/shortcodes/button.html
index d5c09b0be..acf453f9d 100644
--- a/templates/shortcodes/button.html
+++ b/templates/shortcodes/button.html
@@ -7,8 +7,8 @@
     {{ body | trim_start_matches(pat="<p>") | safe}}
 </button>
 
-{% elif current_url is containing('www_threefold_io') %}
-{% set btn_path = 'www_threefold_io' ~ path%}
+{% elif path is starting_with('/') %}
+{% set btn_path = 'www_threefold_io' ~ path %}
 <button onclick="window.location='{{btn_path}}'"
     class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
     {{ body | trim_start_matches(pat="<p>") | safe}}
diff --git a/templates/shortcodes/cloud_header.html b/templates/shortcodes/cloud_header.html
index edaa16951..3a8e60353 100644
--- a/templates/shortcodes/cloud_header.html
+++ b/templates/shortcodes/cloud_header.html
@@ -8,9 +8,8 @@
                 class="text-5xl font-extrabold uppercase">Store</a>
         </div>
         <div class="mb-4">
-            {% if current_url is containing("www_threefold_io")%}
-            {% set path = "www_threefold_io/images/cloud_header_seprated.png"%}
-            <img class="mx-auto sm:w-1/2 lg:w-full" src="{{path}}" alt="TF Cloud" />
+            {% 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" />
             {% else %}
             <img class="mx-auto sm:w-1/2 lg:w-full" src="images/cloud_header_seprated.png" alt="TF Cloud" />
             {% endif %}