diff --git a/examples/test-images.yaml b/examples/api-test-images.yaml
similarity index 100%
rename from examples/test-images.yaml
rename to examples/api-test-images.yaml
diff --git a/examples/candidate-tag-values.yaml b/examples/api-test-values.yaml
similarity index 81%
rename from examples/candidate-tag-values.yaml
rename to examples/api-test-values.yaml
index 68d0d86..dc43f9b 100644
--- a/examples/candidate-tag-values.yaml
+++ b/examples/api-test-values.yaml
@@ -13,28 +13,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Set all image tags to "candidate" to use imagebuilder's local images
-# Also set imagePullPolicy to IfNotPresent, so these images will be used.
+# Values file for API tests
+#
+# The test process is to install minikube directly on a machine with docker
+# installed (`--vm-driver=none`) then use imagebuilder to build images with
+# candidate tags into that local docker registry, and run the tests.
 
-# in xos-core, rcord-lite, onos and voltha charts
+# shared by xos-core, rcord-lite, etc.
 imagePullPolicy: 'IfNotPresent'
 
-# in xos-core chart
+# xos core
+xos-gui:
+  enabled: false
+
 xos_coreImage: 'xosproject/xos-core:candidate'
 xos_chameleonImage: 'xosproject/chameleon:candidate'
 xos_toscaImage: 'xosproject/xos-tosca:candidate'
 xos_api_testerImage: 'xosproject/xos-api-tester:candidate'
 
-# in xos-gui sub-chart required by xos-core chart
-xos-gui:
-  xos_guiImage: 'xosproject/xos-gui:candidate'
-  xos_wsImage: 'xosproject/xos-ws:candidate'
-  imagePullPolicy: 'IfNotPresent'
-
-# in rcord-lite chart
+# rcord-lite
 rcord_synchronizerImage: "xosproject/rcord-synchronizer:candidate"
 
-# in service charts
+# xossh
+xosshImage: 'xosproject/xos-client:candidate'
+
+# XOS service charts
 addressmanager:
   addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:candidate"
   imagePullPolicy: 'IfNotPresent'
diff --git a/examples/candidate-tag-values.yaml b/examples/image-tag-candidate.yaml
similarity index 76%
copy from examples/candidate-tag-values.yaml
copy to examples/image-tag-candidate.yaml
index 68d0d86..8b7f3b4 100644
--- a/examples/candidate-tag-values.yaml
+++ b/examples/image-tag-candidate.yaml
@@ -13,11 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Set all image tags to "candidate" to use imagebuilder's local images
-# Also set imagePullPolicy to IfNotPresent, so these images will be used.
-
-# in xos-core, rcord-lite, onos and voltha charts
-imagePullPolicy: 'IfNotPresent'
+# Set all image tags to "candidate" to use locally built images
 
 # in xos-core chart
 xos_coreImage: 'xosproject/xos-core:candidate'
@@ -29,7 +25,6 @@
 xos-gui:
   xos_guiImage: 'xosproject/xos-gui:candidate'
   xos_wsImage: 'xosproject/xos-ws:candidate'
-  imagePullPolicy: 'IfNotPresent'
 
 # in rcord-lite chart
 rcord_synchronizerImage: "xosproject/rcord-synchronizer:candidate"
@@ -37,26 +32,18 @@
 # in service charts
 addressmanager:
   addressmanager_synchronizerImage: "xosproject/addressmanager-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 fabric:
   fabric_synchronizerImage: "xosproject/fabric-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 onos-service:
   onos_synchronizerImage: "xosproject/onos-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 volt:
   volt_synchronizerImage: "xosproject/volt-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 vsg-hw:
   vsg_hw_synchronizerImage: "xosproject/vsg-hw-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 vrouter:
   vrouter_synchronizerImage: "xosproject/vrouter-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 kubernetes:
   kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 simpleexampleservice:
   simpleexampleservice_synchronizerImage: "xosproject/simpleexampleservice-synchronizer:candidate"
-  imagePullPolicy: 'IfNotPresent'
 
diff --git a/examples/if-not-present-values.yaml b/examples/imagePullPolicy-IfNotPresent.yaml
similarity index 100%
rename from examples/if-not-present-values.yaml
rename to examples/imagePullPolicy-IfNotPresent.yaml
diff --git a/examples/test-values.yaml b/examples/test-values.yaml
deleted file mode 100644
index 9127993..0000000
--- a/examples/test-values.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# API test values file
-
-xos-gui:
-  enabled: false
-