diff --git a/test/acse-conf/acse-svc-dcos.json b/test/acse-conf/acse-svc-dcos.json
index 631af3a674..e256342860 100644
--- a/test/acse-conf/acse-svc-dcos.json
+++ b/test/acse-conf/acse-svc-dcos.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "cluster_definition": "dcos.json",
+      "cluster_definition": "dcos-D2.json",
       "category": "service-availability",
       "location": "australiaeast"
     },
diff --git a/test/acse-conf/acse-svc-k8s-win.json b/test/acse-conf/acse-svc-k8s-win.json
index d59196cc64..7867078c15 100644
--- a/test/acse-conf/acse-svc-k8s-win.json
+++ b/test/acse-conf/acse-svc-k8s-win.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "cluster_definition": "windows/kubernetes.json",
+      "cluster_definition": "windows/kubernetes-D2.json",
       "category": "service-availability",
       "location": "australiaeast"
     },
@@ -106,7 +106,7 @@
       "location": "japaneast"
     },
     {
-      "cluster_definition": "dcos-D2.json",
+      "cluster_definition": "windows/kubernetes-D2.json",
       "category": "service-availability",
       "location": "japanwest"
     },
diff --git a/test/acse-conf/acse-svc-k8s.json b/test/acse-conf/acse-svc-k8s.json
index 0b3494c1ef..d949b3ab20 100644
--- a/test/acse-conf/acse-svc-k8s.json
+++ b/test/acse-conf/acse-svc-k8s.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "cluster_definition": "kubernetes.json",
+      "cluster_definition": "kubernetes-D2.json",
       "category": "service-availability",
       "location": "australiaeast"
     },
@@ -106,7 +106,7 @@
       "location": "japaneast"
     },
     {
-      "cluster_definition": "dcos-D2.json",
+      "cluster_definition": "kubernetes-D2.json",
       "category": "service-availability",
       "location": "japanwest"
     },
diff --git a/test/acse-conf/acse-svc-swarmmode.json b/test/acse-conf/acse-svc-swarmmode.json
index 97585bf8ff..5f9228f716 100644
--- a/test/acse-conf/acse-svc-swarmmode.json
+++ b/test/acse-conf/acse-svc-swarmmode.json
@@ -1,7 +1,7 @@
 {
   "deployments": [
     {
-      "cluster_definition": "swarmmode.json",
+      "cluster_definition": "swarmmode-D2.json",
       "category": "service-availability",
       "location": "australiaeast"
     },
@@ -106,7 +106,7 @@
       "location": "japaneast"
     },
     {
-      "cluster_definition": "dcos-D2.json",
+      "cluster_definition": "swarmmode-D2.json",
       "category": "service-availability",
       "location": "japanwest"
     },