diff --git a/ccp/modules/datashield-setup.sh b/ccp/modules/datashield-setup.sh
index 4d7489c..5020f73 100644
--- a/ccp/modules/datashield-setup.sh
+++ b/ccp/modules/datashield-setup.sh
@@ -2,9 +2,9 @@
 
 if [ "$ENABLE_DATASHIELD" == true ]; then
   # HACK: This only works because exporter-setup.sh and teiler-setup.sh are sourced after datashield-setup.sh
-  ENABLE_EXPORTER=true
-  ENABLE_TEILER=true
-
+  if [ -z "${ENABLE_EXPORTER}" ] || [ "${ENABLE_EXPORTER}" != "true" ]; then
+    echo "The ENABLE_EXPORTER variable is either not set or not set to 'true'."
+  fi
   OAUTH2_CALLBACK=/oauth2/callback
   OAUTH2_PROXY_SECRET="$(echo \"This is a salt string to generate one consistent encryption key for the oauth2_proxy. It is not required to be secret.\" | openssl rsautl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 32)"
   add_private_oidc_redirect_url "${OAUTH2_CALLBACK}"
@@ -29,12 +29,12 @@ if [ "$ENABLE_DATASHIELD" == true ]; then
     "id": .,
     "virtualhost": "\(.):443",
     "beamconnect": "datashield-connect.\(.).'"$BROKER_ID"'"
-  })}' $sites > /tmp/bridgehead/opal-map/central.json
+  })}' $sites >/tmp/bridgehead/opal-map/central.json
   echo "$sites" | docker_jq -n --args '[{
     "external": "'"$SITE_ID"':443",
     "internal": "opal:8443",
     "allowed": input | map("datashield-connect.\(.).'"$BROKER_ID"'")
-  }]' > /tmp/bridgehead/opal-map/local.json
+  }]' >/tmp/bridgehead/opal-map/local.json
   if [ "$USER" == "root" ]; then
     chown -R bridgehead:docker /tmp/bridgehead
     chmod g+wr /tmp/bridgehead/opal-map/*