diff --git a/explore/deploy/copysitemaps b/explore/deploy/copysitemaps
new file mode 100644
index 00000000..23450b58
--- /dev/null
+++ b/explore/deploy/copysitemaps
@@ -0,0 +1,14 @@
+cp /home/argiro.kokogiannaki/sitemap/dataset/*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/dataset/*  dist/browser/;
+cp /home/argiro.kokogiannaki/sitemap/publication/*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/publication/*  dist/browser/;
+cp /home/argiro.kokogiannaki/sitemap/software/*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/software/*  dist/browser/;
+cp /home/argiro.kokogiannaki/sitemap/other/*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/other/*  dist/browser/;
+cp /home/argiro.kokogiannaki/sitemap/project/*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/project/*  dist/browser/;
+cp /home/argiro.kokogiannaki/sitemap/organization/*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/organization/*  dist/browser/;
+cp /home/argiro.kokogiannaki/sitemap/dataprovider//*  dist/server/;
+cp /home/argiro.kokogiannaki/sitemap/dataprovider/*  dist/browser/;
diff --git a/explore/src/app/app.component.ts b/explore/src/app/app.component.ts
index 780bbf73..eaa4d92f 100644
--- a/explore/src/app/app.component.ts
+++ b/explore/src/app/app.component.ts
@@ -94,9 +94,7 @@ bottomMenuItems =[
      if (typeof document !== 'undefined') {
        try{
          this.isClient = true;
-         if(Session.isPortalAdministrator()){
-           this.userMenuItems.push(new MenuItem("","Manage helptexts","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{}))
-         }
+
        }catch (e) {
        }
 
@@ -106,6 +104,10 @@ bottomMenuItems =[
                  this.propertiesService.setEnvProperties(es);
                  this.properties = this.propertiesService.envSpecific;
                  this.feedbackmail = this.properties.feedbackmail;
+                 if(Session.isPortalAdministrator()){
+                   this.userMenuItems.push(new MenuItem("","Manage helptexts",
+                   ((this.properties.environment == "beta")?"https://beta.admin.connect.openaire.eu":"https://admin.explore.openaire.eu")+"/dashboard?communityId=openaire","",true,[],[],{}))
+                 }
                  console.log(this.properties.loginUrl);
              }, error => {
                console.log("App couldn't fetch properties");
diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html
index c1ac6f41..9bd4ad60 100644
--- a/explore/src/app/home/home.component.html
+++ b/explore/src/app/home/home.component.html
@@ -414,7 +414,7 @@
               Explore all OA research results. Link all your research. Build your profile
             </div>
             <p>
-              <a href="https://beta.explore.openaire.eu" class="el-link uk-button uk-button-default">
+              <a [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'explore.openaire.eu'" class="el-link uk-button uk-button-default">
                 OpenAIRE.EXPLORE
               </a>
             </p>
@@ -429,7 +429,7 @@
               Join OpenAIRE, use our tools and make your content more visible around the world.
             </div>
             <p>
-              <a target="_blank" href="https://beta.provide.openaire.eu" class="el-link uk-button uk-button-default">
+              <a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'provide.openaire.eu'" class="el-link uk-button uk-button-default">
                 OpenAIRE.PROVIDE
               </a>
             </p>
@@ -444,7 +444,7 @@
               Use a trusted partner to share, link, disseminate and monitor your research.
             </div>
             <p>
-              <a target="_blank" href="https://beta.connect.openaire.eu" class="el-link uk-button uk-button-default">
+              <a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'connect.openaire.eu'" class="el-link uk-button uk-button-default">
                 OpenAIRE.CONNECT
               </a>
             </p>
diff --git a/explore/src/assets/sitemap.xml b/explore/src/assets/sitemap.xml
index 393b33aa..fd72dfad 100644
--- a/explore/src/assets/sitemap.xml
+++ b/explore/src/assets/sitemap.xml
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/participate/claim]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/participate/claim]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/find]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/find]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/find/publications]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/publications]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/find/datasets]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/datasets]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/find/projects]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/projects]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/find/organizations]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/organizations]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/find/dataproviders]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/find/dataproviders]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/publications]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/publications]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/datasets]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/datasets]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/projects]]></loc>
-      <changefreq>weekly</changefreq>
-      <priority>0.5</priority>
-   </url>   
-   <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/organizations]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/projects]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/dataproviders]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/organizations]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/content-providers]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/advanced/dataproviders]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/search/entity-registries]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/content-providers]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/participate/deposit-publications]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/search/entity-registries]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>
    <url>
-      <loc><![CDATA[https://beta.explore.openaire.eu/participate/deposit-datasets]]></loc>
+      <loc><![CDATA[https://explore.openaire.eu/participate/deposit-publications]]></loc>
+      <changefreq>weekly</changefreq>
+      <priority>0.5</priority>
+   </url>
+   <url>
+      <loc><![CDATA[https://explore.openaire.eu/participate/deposit-datasets]]></loc>
       <changefreq>weekly</changefreq>
       <priority>0.5</priority>
    </url>