diff --git a/utils/properties/environments/environment.all.ts b/utils/properties/environments/environment.all.ts
deleted file mode 100644
index 020b7e89..00000000
--- a/utils/properties/environments/environment.all.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {EnvProperties} from "../env-properties";
-
-export let common: EnvProperties = {
-  swhURL: "https://archive.softwareheritage.org/",
-  // searchCrossrefAPIURL: "https://api.crossref.org/works",
-  // searchDataciteAPIURL: "https://api.datacite.org/works",
-  // searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  // orcidURL: "https://orcid.org/",
-  // doiURL: "https://doi.org/",
-  // pmcURL: "http://europepmc.org/articles/",
-  // pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  // handleURL: "http://hdl.handle.net/",
-  // cordisURL: "http://cordis.europa.eu/projects/",
-  // openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  // r3DataURL: "http://service.re3data.org/repository/",
-  // fairSharingURL: "https://fairsharing.org/",
-  // sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  // sherpaURLSuffix: "/",
-  // zenodo: "https://zenodo.org/",
-  // openAccess: "https://www.openaire.eu/support/faq#article-id-234",
-  // openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
-  // fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
-  // h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
-  // ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
-}
\ No newline at end of file
diff --git a/utils/properties/environments/environment.beta.ts b/utils/properties/environments/environment.beta.ts
deleted file mode 100644
index 520b88e2..00000000
--- a/utils/properties/environments/environment.beta.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {EnvProperties} from "../env-properties";
-
-export let commonBeta: EnvProperties = {
-  // searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
-  // searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
-}
\ No newline at end of file
diff --git a/utils/properties/environments/environment.prod.ts b/utils/properties/environments/environment.prod.ts
deleted file mode 100644
index a2aa22f8..00000000
--- a/utils/properties/environments/environment.prod.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {EnvProperties} from "../env-properties";
-
-export let commonProd: EnvProperties = {
-  // searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
-  // searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
-}
\ No newline at end of file
diff --git a/utils/properties/environments/environment.test.ts b/utils/properties/environments/environment.test.ts
deleted file mode 100644
index 81abb978..00000000
--- a/utils/properties/environments/environment.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import {EnvProperties} from "../env-properties";
-
-export let commonTest: EnvProperties = {
-  // searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/",
-  // searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources",
-}
\ No newline at end of file
diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts
index 69e7ceb1..6faf2d7f 100644
--- a/utils/properties/environments/environment.ts
+++ b/utils/properties/environments/environment.ts
@@ -1,6 +1,45 @@
 import {EnvProperties} from "../env-properties";
 
+export let common: EnvProperties = {
+  swhURL: "https://archive.softwareheritage.org/",
+  // searchCrossrefAPIURL: "https://api.crossref.org/works",
+  // searchDataciteAPIURL: "https://api.datacite.org/works",
+  // searchOrcidURL: "https://pub.orcid.org/v2.1/",
+  // orcidURL: "https://orcid.org/",
+  // doiURL: "https://doi.org/",
+  // pmcURL: "http://europepmc.org/articles/",
+  // pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
+  // handleURL: "http://hdl.handle.net/",
+  // cordisURL: "http://cordis.europa.eu/projects/",
+  // openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
+  // r3DataURL: "http://service.re3data.org/repository/",
+  // fairSharingURL: "https://fairsharing.org/",
+  // sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
+  // sherpaURLSuffix: "/",
+  // zenodo: "https://zenodo.org/",
+  // openAccess: "https://www.openaire.eu/support/faq#article-id-234",
+  // openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
+  // fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
+  // h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
+  // ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
+}
+
 export let commonDev: EnvProperties = {
   // searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
   // searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
+}
+
+export let commonTest: EnvProperties = {
+  // searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/",
+  // searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources",
+}
+
+export let commonBeta: EnvProperties = {
+  // searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
+  // searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
+}
+
+export let commonProd: EnvProperties = {
+  // searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
+  // searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
 }
\ No newline at end of file