diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts
index 1e8b32c4..18c60846 100644
--- a/connect/connectHelper.ts
+++ b/connect/connectHelper.ts
@@ -6,7 +6,7 @@ import {CommunityInfo} from "./community/communityInfo";
 export class ConnectHelper {
 
   public static  getCommunityFromDomain(domain: string): string{
-    if(properties.adminToolsPortalType === 'irish') {
+    if(properties.dashboard === 'irish') {
       return properties.adminToolsCommunity;
     }
     if(properties.environment == "development" &&
diff --git a/dashboard/portal/portalHelper.ts b/dashboard/portal/portalHelper.ts
index 5239ecb4..3f915e10 100644
--- a/dashboard/portal/portalHelper.ts
+++ b/dashboard/portal/portalHelper.ts
@@ -12,6 +12,7 @@ export class PortalUtils {
     {value: 'ri', label: StakeholderConfiguration.ENTITIES.ri + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
     {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
     {value: 'project', label: StakeholderConfiguration.ENTITIES.project + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
+    {value: 'country', label: StakeholderConfiguration.ENTITIES.country + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
   ];
 
 }
diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts
index 66732aec..ad8bec01 100644
--- a/landingPages/result/resultLanding.service.ts
+++ b/landingPages/result/resultLanding.service.ts
@@ -338,7 +338,7 @@ export class ResultLandingService {
       if (this.resultLandingInfo.fos) {
         this.resultLandingInfo.fos.sort((a, b) => a.id.localeCompare(b.id));
       }
-      if(properties.adminToolsPortalType != "irish") {
+      if(properties.dashboard != "irish") {
         this.resultLandingInfo.sdg = subjectResults[4];
         if (this.resultLandingInfo.sdg) {
           this.resultLandingInfo.sdg.sort((a, b) => {
diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.html b/monitor-admin/manageStakeholders/manageStakeholders.component.html
index bc700007..74f005ff 100644
--- a/monitor-admin/manageStakeholders/manageStakeholders.component.html
+++ b/monitor-admin/manageStakeholders/manageStakeholders.component.html
@@ -11,8 +11,8 @@
   </div>
   <div actions>
     <div class="uk-section-xsmall">
-      <div class="uk-flex uk-flex-center uk-flex-wrap uk-flex-middle" [ngClass]="properties.adminToolsPortalType == 'irish' ? 'uk-flex-between@m' : 'uk-flex-right@m'">
-        <div *ngIf="properties.adminToolsPortalType == 'irish'" class="uk-width-medium uk-margin-small-bottom">
+      <div class="uk-flex uk-flex-center uk-flex-wrap uk-flex-middle" [ngClass]="properties.dashboard == 'irish' ? 'uk-flex-between@m' : 'uk-flex-right@m'">
+        <div *ngIf="properties.dashboard == 'irish'" class="uk-width-medium uk-margin-small-bottom">
           <div input type="select" placeholder="Type"
             [options]="typeOptions" [formInput]="filters.get('type')">
           </div>
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index 69b026d1..b94be019 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -1199,7 +1199,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
   }
 
   private checkForSchemaEnhancements(url: string) {
-    this.showCheckForSchemaEnhancements = this.isAdministrator && url && !this.properties.useOldStatisticsSchema && this.indicatorUtils.checkForSchemaEnhancements(url) && this.properties.adminToolsPortalType != 'irish';
+    this.showCheckForSchemaEnhancements = this.isAdministrator && url && !this.properties.useOldStatisticsSchema && this.indicatorUtils.checkForSchemaEnhancements(url) && this.properties.dashboard != 'irish';
   }
 
   migrateFromOldImportJsonFile(charts) {
diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts
index 7498bc6c..4d653b7f 100644
--- a/orcid/orcid-work.component.ts
+++ b/orcid/orcid-work.component.ts
@@ -403,7 +403,7 @@ export class OrcidWorkComponent {
     }, error => {
       this.isLoggedIn = false;
     }));
-    if(properties.adminToolsPortalType == 'irish'){
+    if(properties.dashboard == 'irish'){
       this.subscriptions.push(this._userProfileService.getUserProfile().subscribe(userProfile => {
         this.hasConsent = userProfile.consent;
       }, error =>{
@@ -531,7 +531,7 @@ export class OrcidWorkComponent {
         }
       });
     } else {
-      if(properties.adminToolsPortalType == 'irish' && !this.hasConsent){
+      if(properties.dashboard == 'irish' && !this.hasConsent){
         this._router.navigate(['/consent'], {
           queryParams: {
             "errorCode": LoginErrorCodes.NOT_VALID,
diff --git a/searchPages/searchUtils/entitiesSelection.component.ts b/searchPages/searchUtils/entitiesSelection.component.ts
index cca954dd..73388a0c 100644
--- a/searchPages/searchUtils/entitiesSelection.component.ts
+++ b/searchPages/searchUtils/entitiesSelection.component.ts
@@ -107,7 +107,7 @@ export class EntitiesSelectionComponent {
     } else if ((this.customFilter && this.customFilter.queryFieldName == "community") ||
       (this.customFilter && (this.customFilter.queryFieldName == "relfunder" || this.customFilter.queryFieldName == "funder")) ||
       (this.customFilter && this.customFilter.queryFieldName == "relorganizationid")
-    || this.properties.adminToolsPortalType == "irish") {
+    || this.properties.dashboard == "irish") {
       this.entities.push({label: OpenaireEntities.RESULTS, value: 'result'});
       this.entities.push({label: OpenaireEntities.PROJECTS, value: 'project'});
       this.entities.push({label: OpenaireEntities.ORGANIZATIONS, value: 'organization'});
diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts
index 77fb773a..234bce1d 100644
--- a/utils/properties/env-properties.ts
+++ b/utils/properties/env-properties.ts
@@ -1,6 +1,6 @@
 export type Environment = "development" | "test" | "beta" | "production";
-export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc";
-export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc" | "irish";
+export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc" | "irish";
+export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc" | "country";
 
 export interface EnvProperties {
   environment?: Environment;
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index a6511fd9..d7a1d0f8 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -126,7 +126,7 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
     this.linking = true;
     this.share = true;
     this.cite = true;
-    this.orcid = (this.properties.adminToolsPortalType == 'explore' || this.properties.adminToolsPortalType == 'community' || this.properties.adminToolsPortalType == 'aggregator' || this.properties.adminToolsPortalType == 'irish') &&
+    this.orcid = (this.properties.adminToolsPortalType == 'explore' || this.properties.adminToolsPortalType == 'community' || this.properties.adminToolsPortalType == 'aggregator' || this.properties.dashboard == 'irish') &&
       this.showOrcid && this.result.identifiers && this.result.identifiers.size > 0;
   }