diff --git a/config/initializers/dspace.rb b/config/initializers/dspace.rb
index f4b6351ba393f95b933c67167b1e6bc5b39c2514..cf63e0c4bf7e2e2ba8b78c4a34a9cb371ef5254b 100644
--- a/config/initializers/dspace.rb
+++ b/config/initializers/dspace.rb
@@ -3,7 +3,14 @@ require 'yaml'
 dspace_configs = YAML.load_file(Rails.root.join('config').to_s.concat('/dspace.yml'))
 env_config = dspace_configs.fetch(Rails.env)
 
-Dspace::Config.host = env_config['host']
-Dspace::Config.port = env_config['port']
-Dspace::Config.rest_webapp_name = env_config['rest_webapp_name']
-Dspace::Config.solr_webapp_name = env_config['solr_webapp_name']
+if Rails.env.production?
+  Dspace::Config.host = ENV['PORTALMEC_DSPACE_HOST']
+  Dspace::Config.port = ENV['PORTALMEC_DSPACE_PORT']
+  Dspace::Config.rest_webapp_name = ENV['PORTALMEC_DSPACE_REST_NAME']
+  Dspace::Config.solr_webapp_name = ENV['PORTALMEC_DSPACE_SOLR_NAME']
+else
+  Dspace::Config.host = env_config['host']
+  Dspace::Config.port = env_config['port']
+  Dspace::Config.rest_webapp_name = env_config['rest_webapp_name']
+  Dspace::Config.solr_webapp_name = env_config['solr_webapp_name']
+end