diff --git a/config/airflow.cfg b/config/airflow.cfg
index a2b2eafb89e86682d42387dc4a91a58d481e47af..c294026abf192b1b3c1c7ce8c1595882c26c2901 100644
--- a/config/airflow.cfg
+++ b/config/airflow.cfg
@@ -1091,4 +1091,5 @@ shard_code_upper_limit = 10000
 shards = 5
 
 # comma separated sensor classes support in smart_sensor.
-sensors_enabled = NamedHivePartitionSensor
\ No newline at end of file
+sensors_enabled = NamedHivePartitionSensor
+
diff --git a/scripts/cloudinit.yml b/scripts/cloudinit.yml
index 02d59ee2f80324838e14c648c5d17249864e7220..73137c7cb172bd9c3ca04f5e34e6998882f1ef0c 100644
--- a/scripts/cloudinit.yml
+++ b/scripts/cloudinit.yml
@@ -51,10 +51,11 @@ runcmd:
   - cd /home/maria
   - mkdir airflow-testing
   - cd airflow-testing
-  - mkdir -p ./dags ./logs ./plugins ./config
+  - mkdir -p ./dags ./logs ./plugins ./config ./templates
   - cp ../data-logistics-service/dags/* ./dags
   - cp -r ../data-logistics-service/plugins/* ./plugins
   - cp ../data-logistics-service/config/* ./config
+  - cp ../data-logistics-service/templates/* ./templates
   # - echo "AIRFLOW_UID=0\nAIRFLOW_GID=0" > ../data-logistics-service/dockers/.env #for root
   - export AIRFLOW_UID=$(id -u)
   - export AIRFLOW_GID=0
diff --git a/templates/footer.html b/templates/footer.html
index 665e5bcebf37022368407a2523dc1c804471eae8..442715dc62e970cc309627fa838c814440cc9a17 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,39 +1,37 @@
 {% block footer %}
-<footer class="pt-5 align-self-center align-middle footer" style="height: auto; color: #575756 !important;">
-  <div class="mt-5 pt-5 pb-5">
-    <div class="container">
-      <div></div>
-      <div class="flex-row">
-        <div class="col-lg-3 col-xs-12">
-          <h4 class="text-dark" >Links</h4>
-          <ul class="m-0 p-0" style="list-style-type: none;">
-            <li> <a style="color: #575756" href="https://www.eFlows4HPC.eu">About eFlows4HPC Project</a></li>
-            <li> <a style="color: #575756" href="https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/-/issues">In case of technical problems, create an issue here</a></li>
-            <li> <a style="color: #575756" href="https://www.fz-juelich.de/portal/EN/Service/LegalNotice/_node.html">Impressum</a></li>
-          </ul>
-          <p></p>
-          <p>
-            <a href="https://twitter.com/eFlows4HPC"><i class="fa fa-twitter-square mr-2 fa-2x bg-dark"></i></a>
-            <a href="https://www.linkedin.com/company/eflows4hpc/"><i class="fa fa-linkedin-square  mr-2 fa-2x"></i></a>
-            <a href="https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/"><i class="fa fa-github-square mr-2 fa-2x"></i></a>
-          </p>
-        </div>
-        <div class="col-lg-4 col-xs-12 text-center">
-          <p>
+<footer class="footer d-inlign-flex" style="background-image: url(https://eflows4hpc.eu/wp-content/uploads/2021/02/Barra-gris-footer.png) !important; height: auto; color: #575756 !important;">
+    <div class="container p-0">
+      <div class="p-0 w-100" style="background-image: url(https://eflows4hpc.eu/wp-content/uploads/2021/01/barra-3-color-8.png) !important; width: 100%; height: 15px; background-repeat: no-repeat; background-size: cover"></div>
+      <div class="row mt-2 px-3">
+        <div class="col-lg-6 col-12 d-inlign-flex">
+          <p class="m-3 text-center align-self-center">
             <a href="https://www.eFlows4HPC.eu">
-              <img src="https://eflows4hpc.eu/wp-content/uploads/2021/01/logo-1.png" alt="eFlows4HPC Logo" title="The title of this image" /></a>
+              <img src="https://eflows4hpc.eu/wp-content/uploads/2021/02/logo-blanc_1-1.svg" alt="eFlows4HPC Logo" title="eFlows4HPC" style="height: auto; max-height: 70px;" class="m-4 align-self-center"/>
+            </a>
+            <a href="https://twitter.com/eFlows4HPC"><i class="fa fa-twitter-square m-4 fa-2x" style="color: white"></i></a>
+            <a href="https://www.linkedin.com/company/eflows4hpc/"><i class="fa fa-linkedin-square  mr-4 fa-2x" style="color: white"></i></a>
+            <a href="https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/"><i class="fa fa-github-square mr-4 fa-2x" style="color: white"></i></a>
           </p>
         </div>
-        <div class="col-lg-5 col-xs-12 text-center">
-          <p class="pr-5"><small>This work has been supported by the eFlows4HPC project, contract #955558. This project has received funding from the European High-Performance Computing Joint Undertaking (JU) under grant agreement No 955558.<br>The JU receives support from the European Union’s Horizon 2020 research and innovation programme and Spain, Germany, France, Italy, Poland, Switzerland, Norway. </small></p>
-        </div>
-      </div>
-      <div class="row mt-5">
-        <div class="col text-center">
-          <p style="border-top: 1px solid darkgray;"><small>Based on Apache Airflow {{ version_label }}: {% if airflow_version %}<a href="https://pypi.python.org/pypi/apache-airflow/{{ airflow_version }}" target="_blank">v{{ airflow_version }}</a>{% else %} N/A{% endif %}</small></p>
+        <div class="col-lg-6 col-12 d-inlign-flex">
+          <p class="m-2 align-self-center" style="color: white">
+            <span class="mr-3 mt-1 float-left">
+              <img loading="lazy" src="https://eflows4hpc.eu/wp-content/uploads/2021/01/bandera-8.png" alt="" style="max-width:52px; max-height:34px">
+            </span>
+            <small style="display: flow-root">
+              This work has been supported by the eFlows4HPC project, contract #955558. This project has received funding from the European High-Performance Computing Joint Undertaking (JU) under grant agreement No 955558.
+              <br>
+              The JU receives support from the European Union’s Horizon 2020 research and innovation programme and Spain, Germany, France, Italy, Poland, Switzerland, Norway. 
+              <strong>
+              <a style="color: #f39200" href="https://www.fz-juelich.de/portal/EN/Service/LegalNotice/_node.html">Impressum</a>
+              </strong>
+            </small>
+            <div class="row mt-4 pl-5">
+              <p style="border-top: 1px solid darkgray;"><small>This service is based on Apache Airflow {{ version_label }}: {% if airflow_version %}<a href="https://pypi.python.org/pypi/apache-airflow/{{ airflow_version }}" target="_blank">v{{ airflow_version }}</a>{% else %} N/A{% endif %}</small></p>
+            </div>
+          </p>
         </div>
       </div>
     </div>
-  </div>
 </footer>
 {% endblock %}
diff --git a/templates/main.html b/templates/main.html
index 0305743111965f4dbfa113ae2b97b731be707817..187275c5a77b89463ed2fb39807e074138c7c7f8 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -70,8 +70,8 @@
 {% block footer %}
   {% if not current_user.is_anonymous %}
     {% set version_label = 'Version' %}
+    {% include 'appbuilder/footer.html' %}
   {% endif %}
-  {% include 'appbuilder/footer.html' %}
 {% endblock %}
 
 {% block tail_js %}