diff --git a/scripts/clmc-service/install-clmc-service.sh b/scripts/clmc-service/install-clmc-service.sh
index c6ba51b259638e1ec105ec3418535bc79038aa27..126ea5f6779ce279d320aaa5b1b0d13baca92c95 100755
--- a/scripts/clmc-service/install-clmc-service.sh
+++ b/scripts/clmc-service/install-clmc-service.sh
@@ -102,6 +102,7 @@ mkdir -p /opt/flame/clmc
 start_script_file="/opt/flame/clmc/start.sh"
 echo "#!/bin/bash" > $start_script_file
 echo "export WORKON_HOME=${HOME}/.virtualenvs" >> $start_script_file
+echo "export SFEMC_FQDN=${SFEMC_FQDN}" >> $start_script_file
 echo "source /usr/local/bin/virtualenvwrapper.sh" >> $start_script_file
 echo "workon CLMC" >> $start_script_file
 echo "pserve ${REPO_ROOT}/src/service/production.ini &" >> $start_script_file
diff --git a/scripts/clmc-service/install.sh b/scripts/clmc-service/install.sh
index 90039438a70ee2c502a3d335f9174f80be87cdf9..f1a7aa1c828632351940b2ff5362e1c4650335a0 100755
--- a/scripts/clmc-service/install.sh
+++ b/scripts/clmc-service/install.sh
@@ -27,6 +27,11 @@
 # Force fail on command fail (off for now as virtualenvwrapper install fails)
 set -euo pipefail
 
+if [[ -z "${SFEMC_FQDN}" ]]; then
+    echo "Failed: cannot find SFEMC_FQDN environment variable."
+	exit 1
+fi
+
 # Ensure everything runs in directory of the parent script
 cd `dirname $0`
 
diff --git a/scripts/test/fixture.sh b/scripts/test/fixture.sh
index 725e21d8e58a2df1f129c3c7e0a606d595d0d4ac..8c568ff2dc1ae36294af8484850bf3d79da9decd 100755
--- a/scripts/test/fixture.sh
+++ b/scripts/test/fixture.sh
@@ -52,7 +52,7 @@ create() {
         if [ ${service_name} == "clmc-service" ]; then
             cmd="/vagrant/scripts/clmc-service/install.sh"
             echo "Provisioning command ${cmd}"
-            lxc exec ${service_name} --env REPO_ROOT="/vagrant" -- ${cmd}
+            lxc exec ${service_name} --env REPO_ROOT="/vagrant" --env SFEMC_FQDN="sfemc.localhost" -- ${cmd}
             exit_code=$?
             if [ $exit_code != 0 ]; then
                 echo "clmc-service installation failed with exit code ${exit_code}"
diff --git a/src/service/clmcservice/__init__.py b/src/service/clmcservice/__init__.py
index b710578a689fb7066c777e3143f8883c49e05bf1..70c6e76cad9a94cfca999f2b6f54ab717627c2b8 100644
--- a/src/service/clmcservice/__init__.py
+++ b/src/service/clmcservice/__init__.py
@@ -26,6 +26,7 @@
 # Python standard libs
 from json import load
 from os.path import dirname, abspath
+import os
 
 # PIP installed libs
 from pyramid.config import Configurator
@@ -47,6 +48,8 @@ def main(global_config, **settings):
     DBSession.configure(bind=engine)  # bind the engine to a DB session
     Base.metadata.bind = engine  # bind the engine to the Base class metadata
 
+    settings['sfemc_fqdn'] = os.environ['SFEMC_FQDN']  # read the SFEMC FQDN from the OS environment
+
     settings['influx_port'] = int(settings['influx_port'])  # the influx port setting must be converted to integer instead of a string
     settings['kapacitor_port'] = int(settings['kapacitor_port'])  # the kapacitor port setting must be converted to integer instead of a string
 
diff --git a/src/service/development.ini b/src/service/development.ini
index d459d200d5120137079fbb03b0f788c5eaf4c00a..cbc930b6b81038ed0ef4b074d0ff0e674458e9b9 100644
--- a/src/service/development.ini
+++ b/src/service/development.ini
@@ -20,9 +20,6 @@ network_configuration_path = /vagrant/src/service/resources/GraphAPI/network_con
 # PostgreSQL connection url
 sqlalchemy.url = postgresql://clmc:clmc_service@localhost:5432/whoamidb
 
-# SFEMC FQDN
-sfemc_fqdn = sfemc.localhost
-
 # Influx connection
 influx_host = localhost
 influx_port = 8086
diff --git a/src/service/production.ini b/src/service/production.ini
index 94a00710ee9bcc923d25e0778e44f889ddf1a87f..5acb36aa9855c249cd45d988d8d3598e4075da61 100644
--- a/src/service/production.ini
+++ b/src/service/production.ini
@@ -20,9 +20,6 @@ network_configuration_path = /vagrant/src/service/resources/GraphAPI/network_con
 # PostgreSQL connection url
 sqlalchemy.url = postgresql://clmc:clmc_service@localhost:5432/whoamidb
 
-# SFEMC FQDN
-sfemc_fqdn = sfemc.localhost
-
 # Influx connection
 influx_host = localhost
 influx_port = 8086