diff --git a/.shipyard.e2e.ovn.yml b/.shipyard.e2e.ovn.yml
new file mode 100644
index 0000000..0975067
--- /dev/null
+++ b/.shipyard.e2e.ovn.yml
@@ -0,0 +1,7 @@
+---
+cni: ovn
+submariner: true
+nodes: control-plane worker worker
+clusters:
+  cluster1:
+  cluster2:
diff --git a/.shipyard.e2e.yml b/.shipyard.e2e.yml
new file mode 100644
index 0000000..f0f5566
--- /dev/null
+++ b/.shipyard.e2e.yml
@@ -0,0 +1,7 @@
+---
+cni: weave
+submariner: true
+nodes: control-plane worker
+clusters:
+  cluster1:
+  cluster2:
diff --git a/Makefile b/Makefile
index fba1105..202d08b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,10 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
 
 include $(SHIPYARD_DIR)/Makefile.inc
 
-CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
 ifneq (,$(filter ovn,$(_using)))
-CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings.ovn
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
 else
-CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
 endif
 
 override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
diff --git a/cluster_settings b/cluster_settings
deleted file mode 100644
index f9d25ea..0000000
--- a/cluster_settings
+++ /dev/null
@@ -1,10 +0,0 @@
-. "${SCRIPTS_DIR}"/lib/source_only
-
-# We need a minimal setup to verify the deployment works
-clusters=('cluster1' 'cluster2')
-cluster_nodes['cluster1']="control-plane worker"
-cluster_nodes['cluster2']="control-plane worker"
-
-cluster_cni=( ['cluster1']="weave" ['cluster2']="weave" )
-
-cluster_subm=( ['cluster1']="true" ['cluster2']="true" )
diff --git a/cluster_settings.ovn b/cluster_settings.ovn
deleted file mode 100644
index ee25d11..0000000
--- a/cluster_settings.ovn
+++ /dev/null
@@ -1,10 +0,0 @@
-. "${SCRIPTS_DIR}"/lib/source_only
-
-# We need a minimal setup to verify the deployment works
-clusters=('cluster1' 'cluster2')
-cluster_nodes['cluster1']="control-plane worker worker"
-cluster_nodes['cluster2']="control-plane worker worker"
-
-cluster_cni=( ['cluster1']="ovn" ['cluster2']="ovn" )
-
-cluster_subm=( ['cluster1']="true" ['cluster2']="true" )