diff --git a/regtest/regtest10.conf b/regtest/regtest10.conf
index c684f4a4..afce5d3d 100644
--- a/regtest/regtest10.conf
+++ b/regtest/regtest10.conf
@@ -3,7 +3,7 @@ export VIRT_NUM=${VIRT_NUM:-'12'}
 export VIRT_CPUS=${VIRT_CPUS:-'2'}
 export VIRT_MEM=${VIRT_MEM:-'8192'}
 export VIRT_DISK=${VIRT_DISK:-'20G'}
-export CLUSTER_NAME=${CLUSTER_NAME:-'multinodes-ubuntu'}
+export CLUSTER_NAME=${CLUSTER_NAME:-'multinodes'}
 export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'}
 export HOSTNAMES=${HOSTNAMES:-'database,messaging,identity,compute-controller,compute-worker1,compute-worker2,network-server,network-worker,block-storage-volume,block-storage-controller,image,dashboard'}
 export HOST_ROLES=${HOST_ROLES:-'database=os-ops-database;messaging=os-ops-messaging;identity=os-identity;compute-controller=os-compute-controller;network-server=os-network-server;network-worker=os-network-worker;block-storage-volume=os-block-storage-volume;block-storage-controller=os-block-storage-controller;image=os-image;dashboard=os-dashboard'}
diff --git a/regtest/regtest8.conf b/regtest/regtest8.conf
index d8ff6977..0aaa3c7d 100644
--- a/regtest/regtest8.conf
+++ b/regtest/regtest8.conf
@@ -3,7 +3,7 @@ export VIRT_NUM=${VIRT_NUM:-'1'}
 export VIRT_CPUS=${VIRT_CPUS:-'10'}
 export VIRT_MEM=${VIRT_MEM:-'8192'}
 export VIRT_DISK=${VIRT_DISK:-'30G'}
-export CLUSTER_NAME=${CLUSTER_NAME:-'allinone-ubuntu'}
+export CLUSTER_NAME=${CLUSTER_NAME:-'allinone'}
 export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'}
 export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $IPADDR |cut -d. -f'1 2 3'`.84}
 export TENANT_IP_START=${TENANT_IP_START:-'172.16.2.84'}
diff --git a/regtest/regtest9.conf b/regtest/regtest9.conf
index e75fab05..eba78881 100644
--- a/regtest/regtest9.conf
+++ b/regtest/regtest9.conf
@@ -3,7 +3,7 @@ export VIRT_NUM=${VIRT_NUM:-'3'}
 export VIRT_CPUS=${VIRT_CPUS:-'4'}
 export VIRT_MEM=${VIRT_MEM:-'8192'}
 export VIRT_DISK=${VIRT_DISK:-'30G'}
-export CLUSTER_NAME=${CLUSTER_NAME:-'single-controller-ubuntu'}
+export CLUSTER_NAME=${CLUSTER_NAME:-'single-controller'}
 export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu.*'}
 export HOSTNAMES=${HOSTNAMES:-'controller,network,compute'}
 export HOST_ROLES=${HOST_ROLES:-'controller=os-controller;network=os-network,os-block-storage-volume'}