diff --git a/index.html b/index.html
index 7448a5f89..0689cfdc1 100644
--- a/index.html
+++ b/index.html
@@ -124,7 +124,8 @@
 
     </head>
     <body>
-        <iframe id="georchestra-header" src="header.html" scrolling="no" frameBorder="0"></iframe>
+        <geor-header id="georchestra-header"></geor-header>
+        <script id="georchestra-header-script"></script>
         <div id="container">
             <div class="_ms2_init_spinner _ms2_init_center"><div></div></div>
             <div class="_ms2_init_text _ms2_init_center">Loading</div>
diff --git a/indexTemplate.html b/indexTemplate.html
index 150b7dd49..59dabf1f8 100644
--- a/indexTemplate.html
+++ b/indexTemplate.html
@@ -137,7 +137,8 @@
       </script>
   </head>
   <body>
-      <iframe id="georchestra-header" src="header.html" scrolling="no" frameBorder="0"></iframe>
+      <geor-header id="georchestra-header"></geor-header>
+      <script id="georchestra-header-script"></script>
       <div id="container">
           <div class="_ms2_init_spinner _ms2_init_center"><div></div></div>
           <div class="_ms2_init_text _ms2_init_center">Loading</div>
