diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json
index 402cf6f..56d15fc 100644
--- a/deploy/beta-properties.json
+++ b/deploy/beta-properties.json
@@ -1,4 +1,5 @@
 {
+  "environment":"beta",
   "enablePiwikTrack" : false,
   "enableHelper" : true,
   "useCache" : true,
@@ -38,7 +39,7 @@
   "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
 
   "cookieDomain" :".openaire.eu",
-  
+
   "feedbackQuestionaire" :"https://docs.google.com/forms/d/e/1FAIpQLSf7AJ-1MG98qeOKL4BUNBk47AAl5MPJC6CdRu19xIhwApN3NA/viewform",
   "feedbackmail" :"openaire.test@gmail.com",
   "feedbackmailForMissingEntities": "feedback@openaire.eu",
diff --git a/deploy/production-properties.json b/deploy/production-properties.json
index d0fbc67..ab64a1c 100644
--- a/deploy/production-properties.json
+++ b/deploy/production-properties.json
@@ -1,4 +1,5 @@
 {
+  "environment":"production",
   "enablePiwikTrack" : false,
   "enableHelper" : true,
   "useCache" : true,
diff --git a/src/app/pages/claims/claims.component.ts b/src/app/pages/claims/claims.component.ts
index b6f59e6..ef86bca 100644
--- a/src/app/pages/claims/claims.component.ts
+++ b/src/app/pages/claims/claims.component.ts
@@ -5,7 +5,7 @@ import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properti
 
 @Component({
     selector: 'claims',
-    template: `    <claims-admin fetchBy="Context" [fetchId]=communityPid [isConnect]="true" [claimsInfoURL]=claimsInfoURL [moreClaimsURL]="'https://beta.'+communityPid+'.openaire.eu/participate/claim'">
+    template: `    <claims-admin fetchBy="Context" [fetchId]=communityPid [isConnect]="true" [claimsInfoURL]=claimsInfoURL [externalPortalUrl]="externalPortalUrl">
     </claims-admin>`,
 })
 
@@ -13,6 +13,7 @@ export class ClaimsComponent implements OnInit {
 
     communityPid:string;
     claimsInfoURL:string;
+    externalPortalUrl:string ="";
 
     ngOnInit() {
 
@@ -23,6 +24,7 @@ export class ClaimsComponent implements OnInit {
              this.route.data.subscribe((data: { envSpecific: EnvProperties }) => {
                     this.claimsInfoURL = data.envSpecific.claimsInformationLink;
                     console.log(this.claimsInfoURL);
+                    this.externalPortalUrl = "https://"+(data.envSpecific.environment =='beta'?'beta.':'')+((this.communityPid == "openaire")?"explore":this.communityPid)+".openaire.eu"
             });
     }
 
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index 5c301fd..ff857c1 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -1,10 +1,11 @@
 {
+  "environment":"production",
   "enablePiwikTrack" : false,
   "enableHelper" : false,
   "useCache" : false,
   "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
-  "claimsAPIURL" : "http://duffy.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
+  "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
   "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
    "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",