diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index 52897f0e550bdac727806ef26fa95f673772a360..4d980616bc8dabc32e8fef81b6abc682d3f5e62d 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -28,8 +28,8 @@ nodeMetricInterval: 3
 disableGatewayPing: true
 
 # UDB ID
-udbID: 1
-
+udbID: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD"
+udbAddress: "127.0.0.1:18001"
 # Path to UDB public key PEM file
 udbPubKeyPemPath: "../keys/cmix.rip.crt"
 
@@ -62,8 +62,6 @@ udbCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
-udbID: 3
-
 # Time interval (in minutes) in which the database is
 # checked for banned nodes
 BanTrackerInterval: "3"
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 8b67be3e5bf08221df8924e7a1ab09a374ac5398..9fb0760b3ab119415caae7674cd8b7190ca941b1 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -32,7 +32,14 @@ mkdir -p $CLIENTCLEAN
 
 echo "STARTING SERVERS..."
 
-PERMCMD="../bin/permissioning --logLevel 2 -c permissioning.yaml "
+UDBID=$(../bin/client init -s results/udbsession -l results/udbidgen.log --password hello --ndf ndf.json)
+echo "GENERATED UDB ID: $UDBID"
+UDBID=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$UDBID")
+cp permissioning.yaml permissioning-actual.yaml
+sed -i "s/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD/$UDBID/g" permissioning-actual.yaml
+
+
+PERMCMD="../bin/permissioning --logLevel 2 -c permissioning-actual.yaml "
 $PERMCMD > results/permissioning-console.txt 2>&1 &
 PIDVAL=$!
 echo "$PERMCMD -- $PIDVAL"
@@ -116,7 +123,7 @@ echo "$UDBCMD -- $PIDVAL"
 rm rid.txt || true
 while [ ! -s rid.txt ] && [ $cnt -lt 30 ]; do
     sleep 1
-    grep -a "Gateway Polling for Message Reception Begun" results/udb-console.txt > rid.txt || true
+    grep -a "Sending Poll message" results/udb-console.txt > rid.txt || true
     cnt=$(($cnt + 1))
     echo -n "."
 done
@@ -211,13 +218,13 @@ PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 
-CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --register josh13 --addemail josh13@elixxir.io --addphone 6178675309"
+CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --register josh13 --addemail josh13@elixxir.io --addphone 6178675309US"
 eval $CLIENTCMD >> $CLIENTOUT/client13.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 
-CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --searchusername josh13 --searchemail josh13@elixxir.io --searchphone 6178675309"
+CLIENTCMD="timeout 240s ../bin/client ud $CLIENTUDOPTS -l $CLIENTOUT/client13.log -s blob13 --searchusername josh13 --searchemail josh13@elixxir.io --searchphone 6178675309US"
 eval $CLIENTCMD >> $CLIENTOUT/client13.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
diff --git a/basice2e/udb.yaml b/basice2e/udb.yaml
index 9c353db9f0a8d8851ac829e50b182e6ab6cd462d..8e34056764122ccd570ef22a5b95c87f37b449e1 100644
--- a/basice2e/udb.yaml
+++ b/basice2e/udb.yaml
@@ -1,5 +1,9 @@
 # UDB Config for E2E Integration test
 logPath: "./results/udb.log"
-sessionfile: "./results/udb.session"
+sessionPath: "./results/udbsession"
+sessionPass: "hello"
 certPath: "../keys/cmix.rip.crt"
 ndfPath: "ndf.json"
+port: "18001"
+keyPath: "../keys/cmix.rip.key"
+permCertPath: "../keys/cmix.rip.crt"
diff --git a/smokeinfra/permissioning.yaml b/smokeinfra/permissioning.yaml
index c5109895b2c12c27a4be98f48bec0e2ba409db14..d149d39d5c3eb1f0ca1281f3b714448b22546783 100644
--- a/smokeinfra/permissioning.yaml
+++ b/smokeinfra/permissioning.yaml
@@ -40,11 +40,8 @@ udbPubKeyPemPath: "../keys/cmix.rip.crt"
 # Path to the file containing the update ID
 updateIdPath: "results/updateId.txt"
 
-# === REQUIRED FOR ENABLING TLS ===
-# Path to the registration server private key file
-keyPath: "../keys/cmix.rip.key"
-# Path to the registration server certificate file
-certPath: "../keys/cmix.rip.crt"
+# Path to the UDB certificate file
+udbCertPath: "../keys/cmix.rip.crt"
 
 ndfOutputPath: "results/permissions-ndfoutput.json"
 
@@ -56,7 +53,11 @@ certPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
-udbID: 3
+udbID: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMD"
+udbAddress: "127.0.0.1:18001"
+# Path to UDB public key PEM file
+udbPubKeyPemPath: "../keys/cmix.rip.crt"
+
 
 # Time interval (in minutes) in which the database is
 # checked for banned nodes