diff --git a/bbmri/directory-sync-compose.yml b/bbmri/directory-sync-compose.yml
new file mode 100644
index 0000000..486b924
--- /dev/null
+++ b/bbmri/directory-sync-compose.yml
@@ -0,0 +1,8 @@
+services:
+  directory_sync_service:
+    image: "samply/directory_sync_service"
+    environment:
+      DS_DIRECTORY_URL: ${DS_DIRECTORY_URL}
+      DS_DIRECTORY_USER_NAME: ${DS_DIRECTORY_USER_NAME}
+      DS_DIRECTORY_PASS_CODE: ${DS_DIRECTORY_PASS_CODE}
+      DS_TIMER_CRON: ${DS_TIMER_CRON}
\ No newline at end of file
diff --git a/bbmri/directory-sync.sh b/bbmri/directory-sync.sh
new file mode 100755
index 0000000..2eeef4a
--- /dev/null
+++ b/bbmri/directory-sync.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+function dirSetup() {
+	if [ -n "$DS_DIRECTORY_USER_NAME" ]; then
+		log INFO "Directory sync setup detected -- will start directory sync service."
+		OVERRIDE+=" -f ./$PROJECT/directory-sync-compose.yml"
+	fi
+}
diff --git a/bbmri/docker-compose.yml b/bbmri/docker-compose.yml
index 26f2378..2433234 100644
--- a/bbmri/docker-compose.yml
+++ b/bbmri/docker-compose.yml
@@ -104,14 +104,6 @@ services:
       - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
       - ./root.crt.pem:/conf/root.crt.pem:ro
 
-  directory_sync_service:
-    image: "samply/directory_sync_service"
-    environment:
-      DS_DIRECTORY_URL: ${DS_DIRECTORY_URL}
-      DS_DIRECTORY_USER_NAME: ${DS_DIRECTORY_USER_NAME}
-      DS_DIRECTORY_PASS_CODE: ${DS_DIRECTORY_PASS_CODE}
-      DS_TIMER_CRON: ${DS_TIMER_CRON}
-
 volumes:
   blaze-data:
 
diff --git a/bbmri/vars b/bbmri/vars
index 6fb693d..a9c65cb 100644
--- a/bbmri/vars
+++ b/bbmri/vars
@@ -5,3 +5,7 @@ SPOT_BEAM_SECRET_SHORT="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | he
 SPOT_BEAM_SECRET_LONG="ApiKey spot.${PROXY_ID} ${SPOT_BEAM_SECRET_SHORT}"
 SUPPORT_EMAIL=bridgehead@helpdesk.bbmri-eric.eu
 PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
+
+# This will load directory-sync setup.
+source $PROJECT/directory-sync.sh
+dirSetup