diff --git a/.gitignore b/.gitignore
index e19311f..1dd09a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Secrets
 .env*
+!.env.template
 
 # Dependencies
 node_modules
diff --git a/collections/IDEM WebServices/.env.template b/collections/IDEM WebServices/.env.template
new file mode 100644
index 0000000..8474eef
--- /dev/null
+++ b/collections/IDEM WebServices/.env.template	
@@ -0,0 +1,2 @@
+IdemApiPassword_Test=
+IdemApiPassword_Prod=
\ No newline at end of file
diff --git a/collections/IDEM WebServices/environments/IDEM - Prod.yml b/collections/IDEM WebServices/environments/IDEM - Prod.yml
index f6bdaa1..743c1dd 100644
--- a/collections/IDEM WebServices/environments/IDEM - Prod.yml	
+++ b/collections/IDEM WebServices/environments/IDEM - Prod.yml	
@@ -6,4 +6,4 @@ variables:
   - name: IdemApiUsername
     value: elix_ws
   - name: IdemApiPassword
-    value: "{{IdemApiPasswordGlobal}}"
+    value: "{{process.env.IdemApiPassword_Prod}}"
diff --git a/collections/IDEM WebServices/environments/IDEM - Test.yml b/collections/IDEM WebServices/environments/IDEM - Test.yml
index 6a24acb..9d198f9 100644
--- a/collections/IDEM WebServices/environments/IDEM - Test.yml	
+++ b/collections/IDEM WebServices/environments/IDEM - Test.yml	
@@ -6,4 +6,4 @@ variables:
   - name: IdemApiUsername
     value: elix_ws
   - name: IdemApiPassword
-    value: "{{IdemApiPasswordGlobal}}"
+    value: "{{process.env.IdemApiPassword_Test}}"
diff --git a/collections/IRIS GW (Gateway) REST API (v1)/.env.template b/collections/IRIS GW (Gateway) REST API (v1)/.env.template
new file mode 100644
index 0000000..e4b23d3
--- /dev/null
+++ b/collections/IRIS GW (Gateway) REST API (v1)/.env.template	
@@ -0,0 +1 @@
+IrisApiPassword=
\ No newline at end of file
diff --git a/collections/IRIS GW (Gateway) REST API (v1)/environments/IRIS - Prod.yml b/collections/IRIS GW (Gateway) REST API (v1)/environments/IRIS - Prod.yml
index 2547178..401dde2 100644
--- a/collections/IRIS GW (Gateway) REST API (v1)/environments/IRIS - Prod.yml	
+++ b/collections/IRIS GW (Gateway) REST API (v1)/environments/IRIS - Prod.yml	
@@ -6,4 +6,4 @@ variables:
   - name: IrisApiUsername
     value: restentities
   - name: IrisApiPassword
-    value: "{{IrisApiPasswordGlobal}}"
+    value: "{{process.env.IrisApiPassword}}"
diff --git a/collections/Scopus/environments/Scopus - Prod.yml b/collections/Scopus/environments/Scopus - Prod.yml
index 2120b13..5d98e7e 100644
--- a/collections/Scopus/environments/Scopus - Prod.yml	
+++ b/collections/Scopus/environments/Scopus - Prod.yml	
@@ -2,6 +2,6 @@ name: Scopus - Prod
 color: "#2E8A54"
 variables:
   - name: ScopusApiKey
-    value: "{{ScopusApiKey1Global}}"
+    value: "{{process.env.ScopusApiKey1}}"
   - name: ScopusApiKey2
-    value: "{{ScopusApiKey2Global}}"
+    value: "{{process.env.ScopusApiKey2}}"
diff --git a/collections/elixForms API v2/.env.template b/collections/elixForms API v2/.env.template
new file mode 100644
index 0000000..c45991a
--- /dev/null
+++ b/collections/elixForms API v2/.env.template	
@@ -0,0 +1,2 @@
+elixFormsWsAuthenticationToken=
+elixFormsApiPassword=
\ No newline at end of file
diff --git a/collections/elixForms API v2/environments/elixForms - Prod.yml b/collections/elixForms API v2/environments/elixForms - Prod.yml
index f59d86e..5de17ed 100644
--- a/collections/elixForms API v2/environments/elixForms - Prod.yml	
+++ b/collections/elixForms API v2/environments/elixForms - Prod.yml	
@@ -10,8 +10,8 @@ variables:
   - name: elixRegisterResultColumns
     value: ""
   - name: elixFormsWsAuthenticationToken
-    value: "{{elixFormsWsAuthenticationTokenGlobal}}"
+    value: "{{process.env.elixFormsWsAuthenticationToken}}"
   - name: elixFormsApiUrl_Default
     value: "{{elixFormsRootUrl}}/eF/api"
   - name: elixFormsApiPassword
-    value: "{{elixFormsApiPasswordGlobal}}"
+    value: "{{process.env.elixFormsApiPassword}}"
diff --git a/environments/UniPR.yml b/environments/UniPR.yml
index 2549c93..ec45428 100644
--- a/environments/UniPR.yml
+++ b/environments/UniPR.yml
@@ -1,14 +1 @@
 name: UniPR
-variables:
-  - secret: true
-    name: IdemApiPasswordGlobal
-  - secret: true
-    name: IrisApiPasswordGlobal
-  - secret: true
-    name: elixFormsWsAuthenticationTokenGlobal
-  - secret: true
-    name: elixFormsApiPasswordGlobal
-  - secret: true
-    name: ScopusApiKey1Global
-  - secret: true
-    name: ScopusApiKey2Global