diff --git a/config/secrets.yml b/config/secrets.yml
index b25833ecc..0fd0b2c38 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -40,27 +40,22 @@ shared:
   cilogon_client_id: <%= ENV["CILOGON_CLIENT_ID"]%>
   cilogon_secret_key: <%= ENV["CILOGON_SECRET_KEY"]%>
 
-test_development:
-  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] || Socket.gethostname %>
-
 test:
-  <<: *test_development
   database_test_url: <%= ENV['DATABASE_TEST_URL'] %>
+  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] || Socket.gethostname %>
 
-production_staging_sandbox_uat_development:
+development:
   database_url: <%= ENV['DATABASE_URL'] %>
+  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] || Socket.gethostname %>
   omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
 
-development:
-  <<: *test_development
-  <<: *production_staging_sandbox_uat_development
-
-production_staging_sandbox_uat:
-  <<: *production_staging_sandbox_uat_development
+staging:
+  database_url: <%= ENV['DATABASE_URL'] %>
   dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
   http_proxy: <%= ENV['HTTP_PROXY'] %>
   http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
   mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
+  omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
   smtp_address: <%= ENV['SMTP_ADDRESS'] %>
   smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
   smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
@@ -69,13 +64,43 @@ production_staging_sandbox_uat:
   smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>
 
 uat:
-  <<: *production_staging_sandbox_uat
+  database_url: <%= ENV['DATABASE_URL'] %>  
+  dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
+  http_proxy: <%= ENV['HTTP_PROXY'] %>
+  http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
+  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
+  omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
+  smtp_address: <%= ENV['SMTP_ADDRESS'] %>
+  smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
+  smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
+  smtp_password: <%= ENV['SMTP_PASSWORD'] %>
+  smtp_port: <%= ENV['SMTP_PORT'] %>
+  smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>
 
 sandbox:
-  <<: *production_staging_sandbox_uat
-
-staging:
-  <<: *production_staging_sandbox_uat
+  database_url: <%= ENV['DATABASE_URL'] %>  
+  dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
+  http_proxy: <%= ENV['HTTP_PROXY'] %>
+  http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
+  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
+  omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
+  smtp_address: <%= ENV['SMTP_ADDRESS'] %>
+  smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
+  smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
+  smtp_password: <%= ENV['SMTP_PASSWORD'] %>
+  smtp_port: <%= ENV['SMTP_PORT'] %>
+  smtp_user_name: <%= ENV['SMTP_USER_NAME'] %> 
 
 production:
-  <<: *production_staging_sandbox_uat
+  database_url: <%= ENV['DATABASE_URL'] %>
+  dmproadmap_host: <%= ENV['DMPROADMAP_HOST'] %>
+  http_proxy: <%= ENV['HTTP_PROXY'] %>
+  http_proxy_port: <%= ENV['HTTP_PROXY_PORT'] %>
+  mailer_default_host: <%= ENV['MAILER_DEFAULT_HOST'] %>
+  omniauth_full_host: <%= ENV['OMNIAUTH_FULL_HOST'] %>
+  smtp_address: <%= ENV['SMTP_ADDRESS'] %>
+  smtp_authentication: <%= ENV['SMTP_AUTHENTICATION'] %>
+  smtp_domain: <%= ENV['SMTP_DOMAIN'] %>
+  smtp_password: <%= ENV['SMTP_PASSWORD'] %>
+  smtp_port: <%= ENV['SMTP_PORT'] %>
+  smtp_user_name: <%= ENV['SMTP_USER_NAME'] %>