diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index ce96ee6f4..5dd9996f5 100644
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -20,6 +20,7 @@ export DEVSTACK_GATE_TEMPEST=1
 export DEVSTACK_GATE_TEMPEST_NOTESTS=1
 export KEEP_LOCALRC=1
 
+
 DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin heat https://git.openstack.org/openstack/heat'
 DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin ceilometer https://git.openstack.org/openstack/ceilometer'
 DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin aodh https://git.openstack.org/openstack/aodh'
@@ -27,6 +28,11 @@ DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin mistral https://git.openstack.org/opens
 DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage https://git.openstack.org/openstack/vitrage'
 DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage-tempest-plugin https://git.openstack.org/openstack/vitrage-tempest-plugin'
 
+# enable them for gate testing they are disabled by default
+DEVSTACK_LOCAL_CONFIG+=$'\nVITRAGE_USE_STATIC=1'
+DEVSTACK_LOCAL_CONFIG+=$'\nVITRAGE_USE_DOCTOR=1'
+DEVSTACK_LOCAL_CONFIG+=$'\nVITRAGE_USE_PROMETHEUS=1'
+
 # we don't want swift
 DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service s-account s-container s-object s-proxy'
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 474c1fd56..bc84953cb 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -194,6 +194,21 @@ function configure_vitrage {
         disable_vitrage_datasource nagios
     fi
 
+    # remove static vitrage datasource if it's not enabled
+    if [[ "$VITRAGE_USE_STATIC" == "False" ]]; then
+        disable_vitrage_datasource static
+    fi
+
+    # remove doctor vitrage datasource if it's not enabled
+    if [[ "$VITRAGE_USE_DOCTOR" == "False" ]]; then
+        disable_vitrage_datasource doctor
+    fi
+
+    # remove prometheus vitrage datasource if it's not enabled
+    if [[ "$VITRAGE_USE_PROMETHEUS" == "False" ]]; then
+        disable_vitrage_datasource prometheus
+    fi
+
     # add default datasources
     iniset $VITRAGE_CONF datasources types $VITRAGE_DEFAULT_DATASOURCES
 
diff --git a/devstack/settings b/devstack/settings
index 8b6961145..1435de686 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -32,6 +32,10 @@ VITRAGE_SERVICE_PORT=${VITRAGE_SERVICE_PORT:-8999}
 # Toggle for deploying Vitrage with/without nagios
 VITRAGE_USE_NAGIOS=$(trueorfalse False VITRAGE_USE_NAGIOS)
 
+VITRAGE_USE_STATIC=$(trueorfalse False VITRAGE_USE_STATIC)
+VITRAGE_USE_DOCTOR=$(trueorfalse False VITRAGE_USE_DOCTOR)
+VITRAGE_USE_PROMETHEUS=$(trueorfalse False VITRAGE_USE_PROMETHEUS)
+
 VITRAGE_DEFAULT_DATASOURCES=${VITRAGE_DEFAULT_DATASOURCES:-nova.host,nova.instance,nova.zone,nagios,static,aodh,cinder.volume,neutron.network,neutron.port,heat.stack,doctor,prometheus,trove.instance,trove.cluster}
 
 # for now dont use pip install for the client