diff --git a/run-server-allinone/conf/org.apache.ace.client.repository.cfg b/run-server-allinone/conf/org.apache.ace.client.repository.cfg
index 7a64445..dcc7f56 100644
--- a/run-server-allinone/conf/org.apache.ace.client.repository.cfg
+++ b/run-server-allinone/conf/org.apache.ace.client.repository.cfg
Binary files differ
diff --git a/run-server-allinone/scripts/addbundles.gogo b/run-server-allinone/scripts/addbundles.gogo
index dfa1397..d20b870 100644
--- a/run-server-allinone/scripts/addbundles.gogo
+++ b/run-server-allinone/scripts/addbundles.gogo
@@ -4,12 +4,15 @@
 # Creates an additional 100 bundles and 10 configuration files
 #
 
+obrHost = getproperty "org.apache.ace.obr"
+aceObr = "http://$obrHost/obr/"
+
 # install test bundle with additional Gogo commands needed later on in this script
 pwd = (cd) getAbsolutePath
 start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
 
 # create a workspace
-w = (cw)
+w = (cw [obrlocation=$aceObr])
 
 # create 100 bundle artifacts and link them to the 10 features...
 a = 0
diff --git a/run-server-allinone/scripts/clear.gogo b/run-server-allinone/scripts/clear.gogo
index cbea69b..b0553cd 100644
--- a/run-server-allinone/scripts/clear.gogo
+++ b/run-server-allinone/scripts/clear.gogo
@@ -4,13 +4,16 @@
 # attempt to delete anything from an OBR, just all the metadata in ACE.
 #
 
+obrHost = getproperty "org.apache.ace.obr"
+aceObr = "http://$obrHost/obr/"
+
 # install test bundle with additional Gogo commands needed later on in this script
 pwd = (cd) getAbsolutePath
 start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
 
 
 # create a workspace
-w = (cw)
+w = (cw [obrlocation=$aceObr])
 
 # delete contents of workspace
 each ($w la) {$w da $it}
diff --git a/run-server-allinone/scripts/test_autoconf.gogo b/run-server-allinone/scripts/test_autoconf.gogo
index f648f0e..2e35db1 100644
--- a/run-server-allinone/scripts/test_autoconf.gogo
+++ b/run-server-allinone/scripts/test_autoconf.gogo
@@ -1,12 +1,15 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
+obrHost = getproperty "org.apache.ace.obr"
+aceObr = "http://$obrHost/obr/"
+
 # install test bundle with additional Gogo commands needed later on in this script
 pwd = (cd) getAbsolutePath
 
 #start 'file:'$pwd'/../org.apache.ace.test/generated/org.apache.ace.test.jar'
 
 # create a workspace
-w = (cw)
+w = (cw [obrlocation=$aceObr])
 
 $w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.8.jar' true
 $w ca 'file:'$pwd'/../cnf/localrepo/org.apache.felix.metatype/org.apache.felix.metatype-1.1.2.jar' true
@@ -51,7 +54,7 @@
 $w cf2d '(name=autoconf-deps)' '(name=autoconf-test)'
 $w cf2d '(name=shell)' '(name=autoconf-test)'
 $w cf2d '(name=http)' '(name=autoconf-test)'
-	
+
 
 ($w ct [id=target-1] [httpPort="8888"]) setautoapprove true
 $w cd2t '(name=autoconf-test)' '(id=target-1)'