diff --git a/app/oaipmh/oai.py b/app/oaipmh/oai.py
index 69493b3a9..94b8f5a40 100644
--- a/app/oaipmh/oai.py
+++ b/app/oaipmh/oai.py
@@ -20,7 +20,6 @@
 # under the License.
 from lxml import etree  # nosec
 from datetime import datetime, timezone
-from urllib.parse import urlparse
 from app.oaipmh.errors import Errors
 
 
diff --git a/app/static/images/dtgeo.png b/app/static/images/dtgeo.png
new file mode 100644
index 000000000..81041cc58
Binary files /dev/null and b/app/static/images/dtgeo.png differ
diff --git a/app/static/images/nomad_ai4eosc.png b/app/static/images/nomad_ai4eosc.png
new file mode 100644
index 000000000..40870dac1
Binary files /dev/null and b/app/static/images/nomad_ai4eosc.png differ
diff --git a/app/static/images/nomad_ai4eosc_join.png b/app/static/images/nomad_ai4eosc_join.png
new file mode 100644
index 000000000..e9e5055af
Binary files /dev/null and b/app/static/images/nomad_ai4eosc_join.png differ
diff --git a/app/templates/config_form.html b/app/templates/config_form.html
index 52904bedc..bd281c208 100644
--- a/app/templates/config_form.html
+++ b/app/templates/config_form.html
@@ -14,7 +14,7 @@
 {% else %}
   <li class="nav-item"><a class="nav-link" data-id="#InputValues" data-bs-toggle="tab" href=#InputValues>Input Values</a></li>
 {% endif %}
-<li class="nav-item"><a class="nav-link {% if not creds %} active{%endif%}" data-id="#Advanced" data-bs-toggle="tab" href=#Advanced>Cloud Provider Selection</a></li> <!-- always create advanced tab -->
+<li class="nav-item"><a class="nav-link {% if not creds %} active{%endif%}" data-id="#Advanced" data-bs-toggle="tab" href=#Advanced>Cloud Provider</a></li> <!-- always create advanced tab -->
 </ul>
   <!-- end tab creation section -->
 
diff --git a/app/templates/default_form.html b/app/templates/default_form.html
index a886211a8..54a058553 100644
--- a/app/templates/default_form.html
+++ b/app/templates/default_form.html
@@ -1,7 +1,7 @@
 <!-- start tabs creation section -->
 <ul class="nav nav-tabs">
   <li class="nav-item"><a class="nav-link {% if creds %}active{%endif%}" data-id="#InputValues" data-bs-toggle="tab" href="#InputValues">Input Values</a></li>
-  <li class="nav-item"><a class="nav-link {% if not creds %}active{%endif%}" data-id="#Advanced" data-bs-toggle="tab" href="#Advanced">Cloud Provider Selection</a></li>
+  <li class="nav-item"><a class="nav-link {% if not creds %}active{%endif%}" data-id="#Advanced" data-bs-toggle="tab" href="#Advanced">Cloud Provider</a></li>
 </ul>
 <!-- end tab creation section -->
 <div class="tab-content">
diff --git a/app/templates/infrastructures.html b/app/templates/infrastructures.html
index 9679036de..bbd4b193d 100644
--- a/app/templates/infrastructures.html
+++ b/app/templates/infrastructures.html
@@ -18,7 +18,11 @@
   function setInfrState(infid, data) {
       // Set state
       var state = getSpanFromState(data["state"]) ;
-      state += '<strong>' + data["state"] + '&nbsp;</strong>';
+      if (data["state"] == "running") {
+        state += '<strong>configuring&nbsp;</strong>';
+      } else {
+        state += '<strong>' + data["state"] + '&nbsp;</strong>';
+      }
       state += '<div style="display: none;" id="' + infid + '_state_spinner" class="spinner-border spinner-border-sm"></div>';
       state += '</span>';
       $('#' + infid + '_state').html(state);
@@ -27,6 +31,9 @@
       var vms = '';
       var delete_vms = '';
       $.each( data["vm_states"], function( vmId, vmState ) {
+        if (vmState == "running") {
+          vmState = "configuring";
+        }
         var tooltip = getSpanFromState(vmState) + vmState + '</span>';
         vms += '<a class="btn btn-outline-secondary btn-sm" role="button" href="{{ url_for('showvminfo') }}?infId=' + infid + '&vmId=' + vmId + '" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-html="true" data-bs-title="' + tooltip + '">';
         vms += '<span class="fas fa-server mr-2"></span> ' + vmId + '</a>';
diff --git a/app/templates/service_creds.html b/app/templates/service_creds.html
index 782de23ae..fde001549 100644
--- a/app/templates/service_creds.html
+++ b/app/templates/service_creds.html
@@ -62,10 +62,10 @@ <h4 class="font-weight-bold text-primary">Cloud Credentials</h4>
                         {% if 'vo' in cred %}
                          <br><strong>VO: </strong> {{cred["vo"]}}
                          {% if session['vos'] and cred['vo'] not in session['vos'] %}
-                         <i class='fas fa-exclamation-triangle text-warning' title="VO currently not available for the user!. It may cause errors in the Cloud Provider Selection list."></i>
+                         <i class='fas fa-exclamation-triangle text-warning' title="VO currently not available for the user!. It may cause errors in the Cloud Provider list."></i>
                          {% endif %}
                          {% if 'project_id' not in cred %}
-                         <i class='fas fa-exclamation-triangle text-danger' title="Site does not publish this VO on AppDB!. It may cause errors in the Cloud Provider Selection list."></i>
+                         <i class='fas fa-exclamation-triangle text-danger' title="Site does not publish this VO on AppDB!. It may cause errors in the Cloud Provider list."></i>
                          {% endif %}
                         {% endif %}
                         {% if 'host' in cred and 'tenant' in cred %}
diff --git a/app/templates/vminfo.html b/app/templates/vminfo.html
index e2bfb33a2..4b759d9cb 100644
--- a/app/templates/vminfo.html
+++ b/app/templates/vminfo.html
@@ -60,7 +60,11 @@ <h4 class="font-weight-bold text-primary">VM ID {{ vmid }}:</h4>
                     {% else %}
                     <span class="badge bg-warning text-white"><span class="spinner-grow spinner-grow-sm"></span>
                     {% endif %}
+                    {% if state == "running" %}
+                    configuring
+                    {% else %}
                     {{ state }}
+                    {% endif %}
                   </td>
                 </tr>
                 <tr>