diff --git a/config/secrets.yml b/config/secrets.yml
index 9ad157cf3..bd558d1f6 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -19,6 +19,7 @@
 
 shared:
   redis_url: <%= ENV['REDIS_URL'] %>
+  active_storage_directory: <%= ENV['ACTIVE_STORAGE_DIRECTORY'] || Rails.root.join("storage") %>
 
 development: 
   secret_key_base: c0a4bf2c5890d0fa86e1459dd189bc4c5a02f412067b610490885c8c312bf0cea5d988e075761ba7277a8291041c1b2e7cf6c373d4d6f43d4522bc48db76cc1a
@@ -57,7 +58,7 @@ test:
 uat:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
   saml_assertion_consumer_service_url: 'localhost/auth/saml/callback'
-  saml_issuer: 'https://era-test.library.ualberta.ca'
+  saml_issuer: 'https://uat.library.ualberta.ca'
   saml_private_key: <%= ENV['SAML_PRIVATE_KEY'] %>
   saml_certificate: <%= ENV['SAML_CERTIFICATE'] %>
   saml_idp_cert: 'MIIEWzCCA0OgAwIBAgIJALoiStKRScIDMA0GCSqGSIb3DQEBCwUAMIHDMQswCQYDVQQGEwJDQTEQMA4GA1UECAwHQWxiZXJ0YTERMA8GA1UEBwwIRWRtb250b24xHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgQWxiZXJ0YTEqMCgGA1UECwwhSW5mb3JtYXRpb24gU2VydmljZXMgJiBUZWNobm9sb2d5MR4wHAYDVQQDDBVsb2dpbi11YXQudWFsYmVydGEuY2ExIzAhBgkqhkiG9w0BCQEWFHRhbnRvbmlvQHVhbGJlcnRhLmNhMB4XDTE2MDIwOTIyMzM0N1oXDTI2MDIwNjIyMzM0N1owgcMxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdBbGJlcnRhMREwDwYDVQQHDAhFZG1vbnRvbjEeMBwGA1UECgwVVW5pdmVyc2l0eSBvZiBBbGJlcnRhMSowKAYDVQQLDCFJbmZvcm1hdGlvbiBTZXJ2aWNlcyAmIFRlY2hub2xvZ3kxHjAcBgNVBAMMFWxvZ2luLXVhdC51YWxiZXJ0YS5jYTEjMCEGCSqGSIb3DQEJARYUdGFudG9uaW9AdWFsYmVydGEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDdlCs9X2lvzaiC7WaQLsqQ4i'
@@ -69,7 +70,7 @@ uat:
   fcrepo_url: <%= ENV['FCREPO_URL'] %>
   fcrepo_base_path: /uat
   solr_url: <%= ENV['SOLR_URL'] %>
-  
+
 staging:
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
 
diff --git a/config/storage_services.yml b/config/storage_services.yml
index 77c456110..77cbba1c0 100644
--- a/config/storage_services.yml
+++ b/config/storage_services.yml
@@ -4,7 +4,7 @@ test:
 
 local:
   service: Disk
-  root: <%= ENV['ACTIVE_STORAGE_DIRECTORY'] || Rails.root.join("storage") %>
+  root: <%= Rails.application.secrets.active_storage_directory %>
 
 # Use rails secrets:edit to set the AWS secrets (as shared:aws:access_key_id|secret_access_key)
 amazon: