diff --git a/common.sh b/common.sh
index 56ef6ba96..b962013b0 100644
--- a/common.sh
+++ b/common.sh
@@ -469,63 +469,58 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
     fi
   fi
 
+  # Set common values and override below
+  export MASTER_VCPU=4
+  export MASTER_DISK=100
+  export MASTER_MEMORY=32768
+  export NUM_WORKERS=0
+
   case "$SCENARIO" in
       "5CONTROL" )
           export NUM_MASTERS=5
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
           export MASTER_MEMORY=24576
-          export NUM_WORKERS=0
           ;;
       "4CONTROL" )
           export NUM_MASTERS=4
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
           export MASTER_MEMORY=24576
-          export NUM_WORKERS=0
           ;;
       "COMPACT" )
           export NUM_MASTERS=3
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
-          export NUM_WORKERS=0
+          ;;
+      "COMPACTE2E" )
+          export NUM_MASTERS=3
+          export MASTER_VCPU=8
           ;;
       "TNA" )
           export NUM_MASTERS=2
           export MASTER_VCPU=8
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
           export NUM_ARBITERS=1
           export ARBITER_VCPU=2
           export ARBITER_MEMORY=8192
           export ARBITER_DISK=50
-          export NUM_WORKERS=0
           ;;
       "TNF" )
           export NUM_MASTERS=2
           export MASTER_VCPU=8
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
-          export NUM_WORKERS=0
           export ENABLE_TWO_NODE_FENCING="true"
           ;;
       "HA" )
           export NUM_MASTERS=3
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
           export NUM_WORKERS=2
           export WORKER_VCPU=4
           export WORKER_DISK=100
           export WORKER_MEMORY=9000
           ;;
+      "HAE2E" )
+          export NUM_MASTERS=3
+          export NUM_WORKERS=2
+          export WORKER_VCPU=4
+          export WORKER_DISK=100
+          export WORKER_MEMORY=24576
+          ;;
       "SNO" )
           export NUM_MASTERS=1
           export MASTER_VCPU=8
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
-          export NUM_WORKERS=0
           export NETWORK_TYPE="OVNKubernetes"
           export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
           if [[ "${AGENT_PLATFORM_TYPE}" != "external" ]]  && [[ "${AGENT_PLATFORM_TYPE}" != "none" ]]; then
@@ -535,10 +530,6 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
           ;;
       "SNOMIN" )
           export NUM_MASTERS=1
-          export MASTER_VCPU=4
-          export MASTER_DISK=100
-          export MASTER_MEMORY=32768
-          export NUM_WORKERS=0
           export NETWORK_TYPE="OVNKubernetes"
           export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
           if [[ "${AGENT_PLATFORM_TYPE}" != "external" ]]  && [[ "${AGENT_PLATFORM_TYPE}" != "none" ]]; then