diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index d6146bda8b5eb16dfd344a3d6ca7795ea47818fd..dfd2a2878a4fe1fff64a376727c9d621d7c4b070 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -91,7 +91,7 @@ RegCodesFilePath: "regCodes.json"
 # Set address space size for ephemeral IDs
 addressSpace: 32
 
-randomGeoBinning: true
+disableGeoBinning: true
 
 # Public address used in NDF to give to client
 registrationAddress: "0.0.0.0:11421"
\ No newline at end of file
diff --git a/basice2e/regCodes.json b/basice2e/regCodes.json
index 2c51c4c48d4c07f025ef80ddde2a26119f67f1f0..fea6a9d6e7f50348e01fb324a74de2e200506b35 100644
--- a/basice2e/regCodes.json
+++ b/basice2e/regCodes.json
@@ -1 +1 @@
-[{"RegCode": "qpol", "Order": "Americas"},{"RegCode": "yiiq", "Order": "Africa"},{"RegCode": "vydz", "Order": "Russia"},{"RegCode": "gwxs", "Order": "EasternEurope"},{"RegCode": "nahv", "Order": "CentralEurope"}, {"RegCode": "doko", "Order": "Asia"}]
+[{"RegCode": "qpol", "Order": "CR"},{"RegCode": "yiiq", "Order": "GB"},{"RegCode": "vydz", "Order": "SK"},{"RegCode": "gwxs", "Order": "HR"},{"RegCode": "nahv", "Order": "IQ"}, {"RegCode": "doko", "Order": "RU"}]
diff --git a/basice2e/run.sh b/basice2e/run.sh
index d3847418e3070fc5d56146fa0ffc8e3573f0efde..b36c1fdd037dfcb5d55ff041a3dd44995d6825b1 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -54,7 +54,7 @@ fi
 
 echo "NETWORK: $NETWORKENTRYPOINT"
 
-if [ "$NETWORKENTRYPOINT" == "localhost:8440" ]
+if true
 then
     echo "STARTING SERVERS..."
 
diff --git a/smokeinfra/permissioning.yaml b/smokeinfra/permissioning.yaml
index a49be37c60b8609346dcdccca1602123f41064a8..a9d8d4aac8c712a0c746551becd33e74570fd721 100644
--- a/smokeinfra/permissioning.yaml
+++ b/smokeinfra/permissioning.yaml
@@ -92,4 +92,4 @@ schedulingConfigPath: "registration.json"
 # placement)
 RegCodesFilePath: "regCodes.json"
 
-randomGeoBinning: true
\ No newline at end of file
+disableGeoBinning: true
\ No newline at end of file
diff --git a/smokeinfra/regCodes.json b/smokeinfra/regCodes.json
index 2c51c4c48d4c07f025ef80ddde2a26119f67f1f0..fea6a9d6e7f50348e01fb324a74de2e200506b35 100644
--- a/smokeinfra/regCodes.json
+++ b/smokeinfra/regCodes.json
@@ -1 +1 @@
-[{"RegCode": "qpol", "Order": "Americas"},{"RegCode": "yiiq", "Order": "Africa"},{"RegCode": "vydz", "Order": "Russia"},{"RegCode": "gwxs", "Order": "EasternEurope"},{"RegCode": "nahv", "Order": "CentralEurope"}, {"RegCode": "doko", "Order": "Asia"}]
+[{"RegCode": "qpol", "Order": "CR"},{"RegCode": "yiiq", "Order": "GB"},{"RegCode": "vydz", "Order": "SK"},{"RegCode": "gwxs", "Order": "HR"},{"RegCode": "nahv", "Order": "IQ"}, {"RegCode": "doko", "Order": "RU"}]