diff --git a/build/Makefile b/build/Makefile
index 2f354557..288d036a 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -152,7 +152,7 @@ build-client : $(PYTHON_DIR)
 # CLIENT_KEY_COUNT is the number of user keys to create
 # For the test environment we create 10 by default
 CLIENT_KEY_COUNT ?= 10
-CLIENT_CONF_TEMPLATES = $(addprefix $(SCRIPTDIR)/template/, pcontract.toml site.psh)
+CLIENT_CONF_TEMPLATES = $(addprefix $(SCRIPTDIR)/template/, pcontract.toml)
 CLIENT_CONF_TARGET = $(DSTDIR)/opt/pdo/.client_configured
 
 $(CLIENT_CONF_TARGET) : $(PYTHON_DIR) $(CLIENT_CONF_TEMPLATES)
diff --git a/build/cmake/Test.cmake b/build/cmake/Test.cmake
index e5b6c332..5d786610 100644
--- a/build/cmake/Test.cmake
+++ b/build/cmake/Test.cmake
@@ -89,9 +89,9 @@ ENDFUNCTION()
 # -----------------------------------------------------------------
 # ADD_SYSTEM_TEST
 # This function invokes a pdo-shell script on an optional set of
-# parameters. The assumption is that the script loads site.psh to
-# pick up the service configuration. TEST_SERVICE_HOST will be used
-# to configure the services host in site.psh.
+# parameters. The assumption is that site configuration has taken
+# place outside the script (meaning the service data and service
+# group databases are assumed to be up to date).
 # -----------------------------------------------------------------
 FUNCTION(ADD_SYSTEM_TEST contract)
   CMAKE_PARSE_ARGUMENTS(ST "" "SCRIPT" "PARAMS" ${ARGN})
diff --git a/build/tests/service-test.sh b/build/tests/service-test.sh
index ae413e43..22a5472a 100755
--- a/build/tests/service-test.sh
+++ b/build/tests/service-test.sh
@@ -102,28 +102,77 @@ for v in $(seq 0 $((${port_count} - 1))) ; do
 done
 
 # -----------------------------------------------------------------
-say run unit tests for eservice database
+# these functions attemp to create a reproducible environment for
+# each of the tests
 # -----------------------------------------------------------------
+function begin_test {
+    yell $@
+    try ${PDO_SOURCE_ROOT}/build/tests/site-configuration.psh ${PSHELL_OPTS}
+}
+
+function end_test {
+    yell end test
+
+    try pdo-service-db clear ${PSHELL_OPTS}
+    try pdo-service-groups clear ${PSHELL_OPTS}
+}
+
+# -----------------------------------------------------------------
+# -----------------------------------------------------------------
+begin_test run unit tests for eservice database
+
 try ${PDO_SOURCE_ROOT}/build/tests/service-storage-test.psh \
     ${PSHELL_OPTS} \
     --bind tmpfile ${ESDB_FILE}
 
 say create the eservice database using database CLI
 try pdo-service-db clear ${PSHELL_OPTS}
+try pdo-service-groups clear
+
 try pdo-service-db add --url http://${F_SERVICE_HOST}:7101 --name es7101 --type eservice ${PSHELL_OPTS}
 try pdo-service-db add --url http://${F_SERVICE_HOST}:7102 --name es7102 --type eservice ${PSHELL_OPTS}
 try pdo-service-db add --url http://${F_SERVICE_HOST}:7103 --name es7103 --type eservice ${PSHELL_OPTS}
 try pdo-service-db add --url http://${F_SERVICE_HOST}:7104 --name es7104 --type eservice ${PSHELL_OPTS}
 try pdo-service-db add --url http://${F_SERVICE_HOST}:7105 --name es7105 --type eservice ${PSHELL_OPTS}
 
+end_test
+
 # -----------------------------------------------------------------
-say start storage service test
-#  ----------------------------------------------------------------
+# ----------------------------------------------------------------
+begin_test start storage service test
+
 try pdo-test-storage ${LOCAL_OPTS} --url http://${F_SERVICE_HOST}:7201
 
+end_test
+
 # -----------------------------------------------------------------
-say start request test
 # -----------------------------------------------------------------
+begin_test run unit tests for service groups database
+
+try ${PDO_SOURCE_ROOT}/build/tests/service-groups-test.psh \
+    ${PSHELL_OPTS} \
+    --bind tmpfile ${GROUPS_FILE}
+
+say create the service and groups database using the groups CLI
+try pdo-service-db clear ${PSHELL_OPTS}
+try pdo-service-groups clear
+
+try pdo-service-db add --url http://${F_SERVICE_HOST}:7101 --name es7101 --type eservice ${PSHELL_OPTS}
+try pdo-service-db add --url http://${F_SERVICE_HOST}:7102 --name es7102 --type eservice ${PSHELL_OPTS}
+try pdo-service-db add --url http://${F_SERVICE_HOST}:7103 --name es7103 --type eservice ${PSHELL_OPTS}
+try pdo-service-db add --url http://${F_SERVICE_HOST}:7104 --name es7104 --type eservice ${PSHELL_OPTS}
+try pdo-service-db add --url http://${F_SERVICE_HOST}:7105 --name es7105 --type eservice ${PSHELL_OPTS}
+
+try pdo-eservice create --group test1
+try pdo-eservice add --group test1 --url http://${F_SERVICE_HOST}:7101 http://${F_SERVICE_HOST}:7102
+try pdo-eservice add --group test1 --name es7103 es7104
+
+end_test
+
+# -----------------------------------------------------------------
+# -----------------------------------------------------------------
+begin_test start request test
+
 try pdo-test-request \
     ${NETWORK_OPTS} \
     --config pcontract.toml \
@@ -163,33 +212,36 @@ for test_file in ${PDO_SOURCE_ROOT}/build/tests/${INTERPRETER_NAME}/*.json ; do
         --logfile __screen__ --loglevel ${F_LOGLEVEL}
 done
 
+end_test
+
 ## -----------------------------------------------------------------
 ## -----------------------------------------------------------------
 if [[ "$PDO_INTERPRETER" =~ ^"wawaka" ]]; then
-    yell start multi-user tests
+    begin_test start the multi-user test
     try ${PDO_SOURCE_ROOT}/build/tests/multi-user.sh -h ${F_SERVICE_HOST} -l ${F_LEDGER_URL} --loglevel ${F_LOGLEVEL}
+    end_test
 else
     yell no multi-user test for ${PDO_INTERPRETER}
 fi
 
 ## -----------------------------------------------------------------
-yell test failure conditions to ensure they are caught
 ## -----------------------------------------------------------------
-say create the contract
+begin_test test failure conditions to ensure they are caught
 
+say create the contract
 declare CONTRACT_FILE=${PDO_HOME}/contracts/_mock-contract.b64
 if [ ! -f ${CONTRACT_FILE} ]; then
     die missing contract source file, ${CONTRACT_FILE}
 fi
 try ${PDO_HOME}/bin/pdo-create.psh \
     ${PSHELL_OPTS} \
-    --identity user1 --psgroup all --esgroup all --ssgroup all \
+    --client-identity user1 --psgroup all --esgroup all --ssgroup all \
     --pdo_file ${SAVE_FILE} --source ${CONTRACT_FILE} --class mock-contract
 
 say invalid method, this should fail
 ${PDO_HOME}/bin/pdo-invoke.psh \
     ${PSHELL_OPTS} \
-    --identity user1 --pdo_file ${SAVE_FILE} --method no-such-method
+    --client-identity user1 --pdo_file ${SAVE_FILE} --method no-such-method
 if [ $? == 0 ]; then
     die mock contract test succeeded though it should have failed
 fi
@@ -197,36 +249,42 @@ fi
 say policy violation with identity, this should fail
 ${PDO_HOME}/bin/pdo-invoke.psh \
     ${PSHELL_OPTS} \
-    --identity user2 --pdo_file ${SAVE_FILE} --method get_value
+    --client-identity user2 --pdo_file ${SAVE_FILE} --method get_value
 if [ $? == 0 ]; then
     die mock contract test succeeded though it should have failed
 fi
 
+end_test
+
 # -----------------------------------------------------------------
-yell test pdo-shell
 # -----------------------------------------------------------------
+begin_test test pdo-shell
+
 try ${PDO_SOURCE_ROOT}/build/tests/shell-test.psh \
-    ${PSHELL_OPTS} \
-    --bind tmpfile ${GROUPS_FILE}
+    ${PSHELL_OPTS}
+
+end_test
 
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 if [[ "$PDO_INTERPRETER" =~ ^"wawaka" ]]; then
-    yell run system tests for contracts
+    begin_test run system tests for contracts
 
     cd ${PDO_SOURCE_ROOT}/contracts/wawaka
     try make system-test \
         TEST_LOG_LEVEL=${F_LOGLEVEL} \
         TEST_SERVICE_HOST=${F_SERVICE_HOST} \
         TEST_LEDGER=${F_LEDGER_URL}
+    end_test
 else
     yell no system tests for "${PDO_INTERPRETER}"
 fi
 
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
+begin_test run tests for state replication
+
 cd ${PDO_SOURCE_ROOT}/build
-yell run tests for state replication
 say start mock-contract test with replication 3 eservices 2 replicas needed before txn.
 
 try pdo-test-request \
@@ -238,6 +296,8 @@ try pdo-test-request \
     --logfile __screen__ --loglevel ${F_LOGLEVEL} --iterations 100 \
     --num-provable-replicas 2 --availability-duration 100 --randomize-eservice
 
+end_test
+
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 yell completed all service tests
diff --git a/build/template/site.psh b/build/tests/site-configuration.psh
old mode 100644
new mode 100755
similarity index 56%
rename from build/template/site.psh
rename to build/tests/site-configuration.psh
index e6a1db68..d2785c06
--- a/build/template/site.psh
+++ b/build/tests/site-configuration.psh
@@ -1,6 +1,6 @@
 #! /usr/bin/env pdo-shell
 
-## Copyright 2018 Intel Corporation
+## Copyright 2023 Intel Corporation
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -14,13 +14,15 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 
+## load the eservice and pservice groups for the specified service host
+set --conditional -s service_host -v localhost
+set --conditional -s group_file -v ${home}/etc/${service_host}_groups.toml
+
 if --null "${data}"
    echo data macro must be defined
    exit
 fi
 
-set --conditional -s service_host -v "SERVICE_HOST"
-
 ## -----------------------------------------------------------------
 ## Set the default set of eservices that this file knows
 ## about. There may be more that have been added to the
@@ -28,21 +30,50 @@ set --conditional -s service_host -v "SERVICE_HOST"
 ## will be used by the local client to create & interact with
 ## contracts.
 ## -----------------------------------------------------------------
+set -s pservice1 -v http://${service_host}:7001
+set -s pservice2 -v http://${service_host}:7002
+set -s pservice3 -v http://${service_host}:7003
+set -s pservice4 -v http://${service_host}:7004
+set -s pservice5 -v http://${service_host}:7005
+
 set -s eservice1 -v http://${service_host}:7101
 set -s eservice2 -v http://${service_host}:7102
 set -s eservice3 -v http://${service_host}:7103
 set -s eservice4 -v http://${service_host}:7104
 set -s eservice5 -v http://${service_host}:7105
 
-service_db clear
+set -s sservice1 -v http://${service_host}:7201
+set -s sservice2 -v http://${service_host}:7202
+set -s sservice3 -v http://${service_host}:7203
+set -s sservice4 -v http://${service_host}:7204
+set -s sservice5 -v http://${service_host}:7205
+
+set -s persistent_storage_service -v ${sservice1}
 
 ## make sure the minimal set of enclave services is included
 ## if these are already in the database they will not be re-added
-service_db add --url ${eservice1} --name es7101 --type eservice
-service_db add --url ${eservice2} --name es7102 --type eservice
-service_db add --url ${eservice3} --name es7103 --type eservice
-service_db add --url ${eservice4} --name es7104 --type eservice
-service_db add --url ${eservice5} --name es7105 --type eservice
+service_db clear
+
+service_db add --type pservice --url ${pservice1} --name ps7001
+service_db add --type pservice --url ${pservice2} --name ps7002
+service_db add --type pservice --url ${pservice3} --name ps7003
+service_db add --type pservice --url ${pservice4} --name ps7004
+service_db add --type pservice --url ${pservice5} --name ps7005
+
+service_db add --type eservice --url ${eservice1} --name es7101
+service_db add --type eservice --url ${eservice2} --name es7102
+service_db add --type eservice --url ${eservice3} --name es7103
+service_db add --type eservice --url ${eservice4} --name es7104
+service_db add --type eservice --url ${eservice5} --name es7105
+
+service_db add --type sservice --url ${sservice1} --name ss7201
+service_db add --type sservice --url ${sservice2} --name ss7202
+service_db add --type sservice --url ${sservice3} --name ss7203
+service_db add --type sservice --url ${sservice4} --name ss7204
+service_db add --type sservice --url ${sservice5} --name ss7205
+
+## Remove any groups previously defined
+service_groups clear
 
 ## -----------------------------------------------------------------
 ## Define provisioning service groups to simplify specification
@@ -50,28 +81,10 @@ service_db add --url ${eservice5} --name es7105 --type eservice
 ## provisioning services that will be used for provisioning keys
 ## into the contract enclaves.
 ## -----------------------------------------------------------------
-set -s pservice1 -v http://${service_host}:7001
-set -s pservice2 -v http://${service_host}:7002
-set -s pservice3 -v http://${service_host}:7003
-set -s pservice4 -v http://${service_host}:7004
-set -s pservice5 -v http://${service_host}:7005
 
-## default pservice group
-pservice add --url ${pservice1}
-pservice add --url ${pservice2}
-pservice add --url ${pservice3}
-
-## pservice group p1
-pservice add --group p1 --url ${pservice3}
-pservice add --group p1 --url ${pservice4}
-pservice add --group p1 --url ${pservice5}
-
-## pservice group all
-pservice add --group all --url ${pservice1}
-pservice add --group all --url ${pservice2}
-pservice add --group all --url ${pservice3}
-pservice add --group all --url ${pservice4}
-pservice add --group all --url ${pservice5}
+pservice create --group default --name ps7001 ps7002 ps7003
+pservice create --group p1 --name ps7003 ps7004 ps7005
+pservice create --group all --name ps7001 ps7002 ps7003 ps7004 ps7005
 
 ## -----------------------------------------------------------------
 ## Define enclave service groups to simplify specification
@@ -82,43 +95,13 @@ pservice add --group all --url ${pservice5}
 ## often have the current state already cached.
 ## -----------------------------------------------------------------
 
-## default eservice group
-eservice add --url ${eservice1}
-eservice add --url ${eservice2}
-eservice add --url ${eservice3}
-eservice use --url ${eservice1}
-
-## eservice group e2
-eservice add --group e2 --url ${eservice2}
-eservice add --group e2 --url ${eservice3}
-eservice add --group e2 --url ${eservice4}
-eservice use --group e2 --url ${eservice2}
-
-## eservice group e3
-eservice add --group e3 --url ${eservice3}
-eservice add --group e3 --url ${eservice4}
-eservice add --group e3 --url ${eservice5}
-eservice use --group e3 --url ${eservice3}
-
-## eservice group e4
-eservice add --group e4 --url ${eservice4}
-eservice add --group e4 --url ${eservice5}
-eservice add --group e4 --url ${eservice1}
-eservice use --group e4 --url ${eservice4}
-
-## eservice group e5
-eservice add --group e5 --url ${eservice5}
-eservice add --group e5 --url ${eservice1}
-eservice add --group e5 --url ${eservice2}
-eservice use --group e5 --url ${eservice5}
-
-## eservice group all
-eservice add --group all --url ${eservice1}
-eservice add --group all --url ${eservice2}
-eservice add --group all --url ${eservice3}
-eservice add --group all --url ${eservice4}
-eservice add --group all --url ${eservice5}
-eservice use --group all --url ${eservice1}
+eservice create --group default --name es7101 es7102 es7103 --preferred ${eservice1}
+eservice create --group e1 --name es7101 es7102 es7103 --preferred ${eservice1}
+eservice create --group e2 --name es7102 es7103 es7104 --preferred ${eservice2}
+eservice create --group e3 --name es7103 es7104 es7105 --preferred ${eservice3}
+eservice create --group e4 --name es7104 es7105 es7101 --preferred ${eservice4}
+eservice create --group e5 --name es7105 es7101 es7102 --preferred ${eservice5}
+eservice create --group all --name es7101 es7102 es7103 es7104 es7105 --preferred ${eservice1}
 
 ## -----------------------------------------------------------------
 ## Define storage service groups to simplify specification
@@ -136,48 +119,24 @@ eservice use --group all --url ${eservice1}
 ## current state of the object can be retrieved from the
 ## persistent storage service
 ## -----------------------------------------------------------------
-set -s sservice1 -v http://${service_host}:7201
-set -s sservice2 -v http://${service_host}:7202
-set -s sservice3 -v http://${service_host}:7203
-set -s sservice4 -v http://${service_host}:7204
-set -s sservice5 -v http://${service_host}:7205
 
-set -s persistent_storage_service -v ${sservice1}
+sservice create --group default --name ss7201 ss7202 ss7203
+sservice set --group default --duration 120 --replicas 2 --persistent ${persistent_storage_service}
 
-## default sservice group
-sservice add --url ${sservice1}
-sservice add --url ${sservice2}
-sservice add --url ${sservice3}
-sservice set --duration 120 --replicas 2 --persistent ${persistent_storage_service}
+sservice create --group s1 --name ss7201 ss7202 ss7203
+sservice set --group s1 --duration 120 --replicas 2 --persistent ${persistent_storage_service}
 
-## sservice group s2
-sservice add --group s2 --url ${sservice2}
-sservice add --group s2 --url ${sservice3}
-sservice add --group s2 --url ${sservice4}
+sservice create --group s2 --name ss7202 ss7203 ss7204
 sservice set --group s2 --duration 120 --replicas 2 --persistent ${persistent_storage_service}
 
-## sservice group s3
-sservice add --group s3 --url ${sservice3}
-sservice add --group s3 --url ${sservice4}
-sservice add --group s3 --url ${sservice5}
+sservice create --group s3 --name ss7203 ss7204 ss7205
 sservice set --group s3 --duration 120 --replicas 2 --persistent ${persistent_storage_service}
 
-## sservice group s4
-sservice add --group s4 --url ${sservice4}
-sservice add --group s4 --url ${sservice5}
-sservice add --group s4 --url ${sservice1}
+sservice create --group s4 --name ss7204 ss7205 ss7201
 sservice set --group s4 --duration 120 --replicas 2 --persistent ${persistent_storage_service}
 
-## sservice group s5
-sservice add --group s5 --url ${sservice5}
-sservice add --group s5 --url ${sservice1}
-sservice add --group s5 --url ${sservice2}
+sservice create --group s5 --name ss7205 ss7201 ss7202
 sservice set --group s5 --duration 120 --replicas 2 --persistent ${persistent_storage_service}
 
-## all sservices
-sservice add --group all --url ${sservice1}
-sservice add --group all --url ${sservice2}
-sservice add --group all --url ${sservice3}
-sservice add --group all --url ${sservice4}
-sservice add --group all --url ${sservice5}
+sservice create --group all --name ss7201 ss7202 ss7203 ss7204 ss7205
 sservice set --group all --duration 3600 --replicas 3 --persistent ${persistent_storage_service}
diff --git a/client/bin/pdo-create.psh b/client/bin/pdo-create.psh
index 1a748ed9..31265325 100755
--- a/client/bin/pdo-create.psh
+++ b/client/bin/pdo-create.psh
@@ -18,9 +18,9 @@
 ##
 ## Several shell variables are used:
 ## Optional:
-##    psgroup -- the provisioning service group as defined in site.psh
-##    esgroup -- the enclave service group as defined in site.psh
-##    ssgroup -- the storage service group as defined in site.psh
+##    psgroup -- the provisioning service group
+##    esgroup -- the enclave service group
+##    ssgroup -- the storage service group
 ##    save -- directory where the pdo file will be saved
 ##
 ## Required:
@@ -33,9 +33,6 @@
 set --conditional -s data -v .
 set --conditional -s save -v .
 
-set --conditional -s site_configuration -v "${home}/etc/site.psh"
-script -f ${site_configuration}
-
 ## create a random string that uniquely identifies the contract
 ## that we are going to create
 set -s random_id -r 32
diff --git a/client/bin/pdo-invoke.psh b/client/bin/pdo-invoke.psh
index c37a96f4..a61a71c6 100755
--- a/client/bin/pdo-invoke.psh
+++ b/client/bin/pdo-invoke.psh
@@ -33,9 +33,6 @@ set --conditional -s params -v ""
 set --conditional -s method -v ""
 set --conditional -s wait -v "no"
 
-set --conditional -s site_configuration -v "${home}/etc/site.psh"
-script -f ${site_configuration}
-
 if -e ${_identity_} '__unknown__'
    echo missing required parameter, identity
    exit -v -1
diff --git a/contracts/wawaka/attestation-test/scripts/attestation-test.psh b/contracts/wawaka/attestation-test/scripts/attestation-test.psh
index 487ec45a..91b8632a 100755
--- a/contracts/wawaka/attestation-test/scripts/attestation-test.psh
+++ b/contracts/wawaka/attestation-test/scripts/attestation-test.psh
@@ -22,9 +22,6 @@ set --conditional -s test_data -v ${data}
 set --conditional -s _contracts_ -v ${home}/contracts
 set --conditional -s _plugins_ -v ${_contracts_}/plugins
 
-## load the eservice and pservice groups and databases for the site
-script -f ${home}/etc/site.psh
-
 ## some definitions to make it easier to display text
 set -s ENDC   -v "\033[0m"
 set -s BOLD   -v '\033[1m'
diff --git a/contracts/wawaka/interface-test/scripts/interface-test.psh b/contracts/wawaka/interface-test/scripts/interface-test.psh
index ba4e74a5..95db7d91 100755
--- a/contracts/wawaka/interface-test/scripts/interface-test.psh
+++ b/contracts/wawaka/interface-test/scripts/interface-test.psh
@@ -22,9 +22,6 @@ set --conditional -s test_data -v ${data}
 set --conditional -s _contracts_ -v ${home}/contracts
 set --conditional -s _plugins_ -v ${_contracts_}/plugins
 
-## load the eservice and pservice groups for the site
-script -f ${home}/etc/site.psh
-
 ## some definitions to make it easier to display text
 set -s ENDC   -v "\033[0m"
 set -s BOLD   -v '\033[1m'
diff --git a/contracts/wawaka/interpreter-test/scripts/interpreter-test.psh b/contracts/wawaka/interpreter-test/scripts/interpreter-test.psh
index e04d8d2d..82b9762f 100755
--- a/contracts/wawaka/interpreter-test/scripts/interpreter-test.psh
+++ b/contracts/wawaka/interpreter-test/scripts/interpreter-test.psh
@@ -22,9 +22,6 @@ set --conditional -s test_data -v ${data}
 set --conditional -s _contracts_ -v ${home}/contracts
 set --conditional -s _plugins_ -v ${_contracts_}/plugins
 
-## load the eservice and pservice groups for the site
-script -f ${home}/etc/site.psh
-
 ## some definitions to make it easier to display text
 set -s ENDC   -v "\033[0m"
 set -s BOLD   -v '\033[1m'
diff --git a/contracts/wawaka/kv-test/scripts/kv-test.psh b/contracts/wawaka/kv-test/scripts/kv-test.psh
index 0733930b..cab521e7 100755
--- a/contracts/wawaka/kv-test/scripts/kv-test.psh
+++ b/contracts/wawaka/kv-test/scripts/kv-test.psh
@@ -22,10 +22,6 @@ set --conditional -s test_data -v ${data}
 set --conditional -s _contracts_ -v ${home}/contracts
 set --conditional -s _plugins_ -v ${_contracts_}/plugins
 
-## load the eservice and pservice groups for the site
-set --conditional -s site_configuration -v "${home}/etc/site.psh"
-script -f ${site_configuration}
-
 ## some definitions to make it easier to display text
 set -s ENDC   -v "\033[0m"
 set -s BOLD   -v '\033[1m'
diff --git a/docker/Makefile b/docker/Makefile
index 9137b352..e288c7f4 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -151,7 +151,6 @@ clean_images : $(addprefix clean_,$(IMAGES))
 clean_config :
 	rm -f '$(DOCKER_DIR)'/xfer/ccf/keys/*.pem '$(DOCKER_DIR)'/xfer/ccf/etc/*.toml
 	rm -f '$(DOCKER_DIR)'/xfer/services/keys/*.pem '$(DOCKER_DIR)'/xfer/services/etc/*.toml
-	rm -f '$(DOCKER_DIR)'/xfer/services/etc/site.psh
 
 clean : clean_images clean_config clean_repository
 
diff --git a/docker/services_base.yaml b/docker/services_base.yaml
index 6ec5f99d..d9c382cc 100644
--- a/docker/services_base.yaml
+++ b/docker/services_base.yaml
@@ -28,7 +28,7 @@ services:
       - ./xfer/:/project/pdo/xfer/
     entrypoint: /project/pdo/tools/start_services.sh
     healthcheck:
-      test: ["CMD", "test", "-r", "/project/pdo/xfer/site.psh"]
+      test: ["CMD", "test", "-r", "/project/pdo/xfer/site.toml"]
       start_period: 20s
       interval: 10s
       retries: 5
diff --git a/docs/usage.md b/docs/usage.md
index a97353b3..a27a4fd5 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -45,13 +45,6 @@ For simplicity in installation, the file `enclave.toml` in the
 `${PDO_HOME}/etc` directory contains the configuration for the accessing
 the Intel Attestation Service.
 
-In addition, most provided `pdo-shell` scripts use the service
-configuration information found in
-[`${PDO_HOME}/etc/site.psh`](../build/opt/pdo/templates/site.psh).
-That can be included in scripts to load and configure a database of
-enclave, provisioning and storage services. This will simplify script
-execution. Add or change service references as necessary.
-
 Default versions of the configuration files are constructed during the
 build process. The default setup provides configuration files for five
 different service instances plus the `pdo-shell` client configuration.
diff --git a/python/pdo/scripts/ConfigureCLI.py b/python/pdo/scripts/ConfigureCLI.py
index ba00c737..360b5193 100644
--- a/python/pdo/scripts/ConfigureCLI.py
+++ b/python/pdo/scripts/ConfigureCLI.py
@@ -209,22 +209,6 @@ def configure_users() :
         filename = os.path.join(options.output_directory, 'keys', u)
         generate_service_keys(filename)
 
-    # Generate the site.psh
-
-    # This will reproduce the current method of creating site.psh but
-    # this will need to be rethought in the future. Site.psh is really
-    # useful for configuring the test setup, but not representative of
-    # the configuration needed for a multi-server deployment.
-
-    input_site_file = os.path.join(options.template_directory, "site.psh")
-    with open(input_site_file, "r") as sf :
-        lines = sf.readlines()
-
-    output_site_file = os.path.join(options.output_directory, "etc", "site.psh")
-    with open(output_site_file, "w") as sf :
-        for line in lines:
-            sf.write(re.sub(r'SERVICE_HOST', options.host, line))
-
 # -----------------------------------------------------------------
 # -----------------------------------------------------------------
 def configure_ccf() :