diff --git a/tools/collector/scripts/etc.exclude b/tools/collector/scripts/etc.exclude
index d870e9b22..be9bdc8fc 100644
--- a/tools/collector/scripts/etc.exclude
+++ b/tools/collector/scripts/etc.exclude
@@ -1,5 +1,3 @@
-/etc/cinder/volumes
-/etc/nova/instances
 /etc/postgresql
 /etc/alternatives
 /etc/terminfo
diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh b/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh
index e5ccd1ab2..4323ceee0 100644
--- a/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh
+++ b/tools/engtools/hostdata-collectors/scripts/remote/rbzip2-engtools.sh
@@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
 fi
 
 # environment for system commands
-source /etc/nova/openrc
+source /etc/platform/openrc
 
 declare -a CONTROLLER
 declare -a COMPUTE
diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh b/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh
index 21a47a4f3..11b2e115c 100644
--- a/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh
+++ b/tools/engtools/hostdata-collectors/scripts/remote/rstart-engtools.sh
@@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
 fi
 
 # environment for system commands
-source /etc/nova/openrc
+source /etc/platform/openrc
 
 declare -a BLADES
 BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') )
diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh b/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh
index 5637bfd22..f8bb9b7b8 100644
--- a/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh
+++ b/tools/engtools/hostdata-collectors/scripts/remote/rstop-engtools.sh
@@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
 fi
 
 # environment for system commands
-source /etc/nova/openrc
+source /etc/platform/openrc
 
 declare -a BLADES
 BLADES=( $(system host-list | awk '(/compute|controller|storage/) {print $4;}') )
diff --git a/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh b/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh
index 095c5ddb7..4fdfc487e 100644
--- a/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh
+++ b/tools/engtools/hostdata-collectors/scripts/remote/rsync-engtools-data.sh
@@ -11,7 +11,7 @@ if [ $UID -eq 0 ]; then
 fi
 
 # environment for system commands
-source /etc/nova/openrc
+source /etc/platform/openrc
 
 declare -a BLADES
 declare -a CONTROLLER
diff --git a/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py b/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
index b56885eb0..8bdefa2da 100644
--- a/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
+++ b/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
@@ -143,11 +143,11 @@ def parse_arguments(show):
 
 def get_system_creds():
 
-    """ Return keystone credentials by sourcing /etc/nova/openrc. """
+    """ Return keystone credentials by sourcing /etc/platform/openrc. """
     d = {}
 
     proc = subprocess.Popen(['bash', '-c',
-                             'source /etc/nova/openrc && env'],
+                             'source /etc/platform/openrc && env'],
                             stdout=subprocess.PIPE)
 
     for line in proc.stdout: