diff --git a/Makefile b/Makefile
index b0b3a7cd..39acddc6 100644
--- a/Makefile
+++ b/Makefile
@@ -120,12 +120,12 @@ test: manifests generate fmt vet envtest ## Run tests.
 e2etest:
 	make --no-print-directory _e2etest # Workaround to force the flag on Github Action
 
-_e2etest-infra: kind ctlptl tilt kuttl kustomize clusterctl
+local-deploy: kind ctlptl tilt kuttl kustomize clusterctl
 	@echo -n "LINODE_TOKEN=$(LINODE_TOKEN)" > config/default/.env.linode
 	$(CTLPTL) apply -f .tilt/ctlptl-config.yaml
 	$(TILT) ci --timeout 240s -f Tiltfile
 
-_e2etest: manifests generate _e2etest-infra
+_e2etest: manifests generate local-deploy
 	ROOT_DIR="$(PWD)" $(KUTTL) test --config e2e/kuttl-config.yaml
 
 ## --------------------------------------
diff --git a/docs/src/developers/development.md b/docs/src/developers/development.md
index 5ef40a54..7cbea261 100644
--- a/docs/src/developers/development.md
+++ b/docs/src/developers/development.md
@@ -98,7 +98,7 @@ go get <repository>@<version>
 ### Using tilt
 To build a kind cluster and start Tilt, simply run:
 ```sh
-make tilt-cluster
+make local-deploy
 ```
 
 Once your kind management cluster is up and running, you can
diff --git a/e2e/Makefile b/e2e/Makefile
index 5ca1917a..994aeff3 100644
--- a/e2e/Makefile
+++ b/e2e/Makefile
@@ -10,21 +10,9 @@ runThisTest:
 _runThisTest:
 	@D="$$(mktemp -d)" ;\
 	cp $(ROOT_DIR)/e2e/Makefile $$D ;\
-	mkdir $$D/suit ;\
-	cp -r $(PWD) $$D/suit ;\
-	ROOT_DIR=$(ROOT_DIR) KUBECONFIG="$(ROOT_DIR)/kubeconfig" kubectl-kuttl test --timeout 300 --skip-delete "$$D/suit"
-
-getKubeUid:
-	@kubectl get -o jsonpath='{.metadata.uid}' -n "$$NAMESPACE" "$$OBJ"
-
-getKubeLabel:
-	@kubectl get -o jsonpath='{.spec.label}' -n "$$NAMESPACE" "$$OBJ"
-
-patchKubeObj:
-	@kubectl patch --type=merge -p "$$PATCH" -n "$$NAMESPACE" "$$OBJ"
-
-patchKubeObjStatus:
-	@kubectl patch --type=merge --subresource status -p "$$PATCH" -n "$$NAMESPACE" "$$OBJ"
+	mkdir $$D/suite ;\
+	cp -r $(PWD) $$D/suite ;\
+	ROOT_DIR=$(ROOT_DIR) KUBECONFIG="$(ROOT_DIR)/kubeconfig" kubectl-kuttl test --timeout 300 --skip-delete "$$D/suite"
 
 callLinodeApiGet:
 	@curl -s -H "Authorization: Bearer $$LINODE_TOKEN" -H "X-Filter: $$FILTER" -H "Content-Type: application/json" "https://$(TARGET_API)/$(TARGET_API_VERSION)/$$URI"
diff --git a/e2e/README.MD b/e2e/README.MD
index 055a2c48..9ab71aa1 100644
--- a/e2e/README.MD
+++ b/e2e/README.MD
@@ -2,9 +2,8 @@
 
 The E2E framework uses Kuttl under the hood. Kuttl is a simple and most importantly static tool that handles applying manifests for running assertions in a namespace it generates for each test.
 
-In order to dynamically generate manifests, Kuttl supports declaring a `TestStep` manifest which includes an option for running scripts. This allows us apply manifests with dynamic values from stdin.
 
-Additionally, helper functions can be invoked in the scripts by creating a Makefile in each test folder that references `../../Makefile` (i.e. `e2e/Makefile`).
+Helper functions can be invoked in the scripts by creating a Makefile in each test folder that references `../../Makefile` (i.e. `e2e/Makefile`) in order to do custom validation.
 
 ## Example TestStep
 
@@ -13,20 +12,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
   - script: |-
-      cat <<EOF | kubectl apply -n $NAMESPACE -f -
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-      kind: LinodeMachine
-      metadata:
-        ownerReferences:
-        - apiVersion: cluster.x-k8s.io/v1beta1
-          kind: Machine
-          name: machine-sample
-          uid: $(OBJ=machines/machine-sample make getKubeUid)
-        name: linodemachine-sample
-      spec:
-        region: us-sea
-        type: g5-nanode-1
-      EOF
+      URI="nodebalancers" FILTER="{\"label\":\"cluster-test-api-server\"}" make callLinodeApiGet | grep 'results": 1'
 ```
 
 ## Test Execution
@@ -54,6 +40,6 @@ status:
 ## Executing individual tests
 
 ```bash
-make _e2etest-infra # Only once per cluster!
-(cd e2e/linodemachine-controller/minimal ; make runThisTest)
+make local-deploy # Only once per cluster!
+(cd e2e/linodemachine-controller/minimal-linodemachine ; make runThisTest)
 ``` 
diff --git a/e2e/linodecluster-controller/minimal/00-assert.yaml b/e2e/linodecluster-controller/minimal-linodecluster/00-assert.yaml
similarity index 100%
rename from e2e/linodecluster-controller/minimal/00-assert.yaml
rename to e2e/linodecluster-controller/minimal-linodecluster/00-assert.yaml
diff --git a/e2e/linodecluster-controller/minimal/01-create-cluster.yaml b/e2e/linodecluster-controller/minimal-linodecluster/01-create-cluster.yaml
similarity index 75%
rename from e2e/linodecluster-controller/minimal/01-create-cluster.yaml
rename to e2e/linodecluster-controller/minimal-linodecluster/01-create-cluster.yaml
index 6040cd13..444133e7 100644
--- a/e2e/linodecluster-controller/minimal/01-create-cluster.yaml
+++ b/e2e/linodecluster-controller/minimal-linodecluster/01-create-cluster.yaml
@@ -1,9 +1,9 @@
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
-  name: cluster-sample
+  name: cluster-test
 spec:
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
     kind: LinodeCluster
-    name: linodecluster-sample
+    name: linodecluster-test
diff --git a/e2e/linodecluster-controller/minimal/02-assert.yaml b/e2e/linodecluster-controller/minimal-linodecluster/02-assert.yaml
similarity index 86%
rename from e2e/linodecluster-controller/minimal/02-assert.yaml
rename to e2e/linodecluster-controller/minimal-linodecluster/02-assert.yaml
index 6293eda3..68238fbd 100644
--- a/e2e/linodecluster-controller/minimal/02-assert.yaml
+++ b/e2e/linodecluster-controller/minimal-linodecluster/02-assert.yaml
@@ -1,7 +1,7 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeCluster
 metadata:
-  name: linodecluster-sample
+  name: linodecluster-test
   finalizers:
     - infrastructure.cluster.x-k8s.io/v1alpha1
 spec:
diff --git a/e2e/linodecluster-controller/minimal/02-create-linodecluster.yaml b/e2e/linodecluster-controller/minimal-linodecluster/02-create-linodecluster.yaml
similarity index 78%
rename from e2e/linodecluster-controller/minimal/02-create-linodecluster.yaml
rename to e2e/linodecluster-controller/minimal-linodecluster/02-create-linodecluster.yaml
index ac8eb722..c3731202 100644
--- a/e2e/linodecluster-controller/minimal/02-create-linodecluster.yaml
+++ b/e2e/linodecluster-controller/minimal-linodecluster/02-create-linodecluster.yaml
@@ -1,6 +1,6 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeCluster
 metadata:
-  name: linodecluster-sample
+  name: linodecluster-test
 spec:
   region: us-sea
diff --git a/e2e/linodecluster-controller/minimal-linodecluster/03-verify-nodebalancer.yaml b/e2e/linodecluster-controller/minimal-linodecluster/03-verify-nodebalancer.yaml
new file mode 100644
index 00000000..005f982f
--- /dev/null
+++ b/e2e/linodecluster-controller/minimal-linodecluster/03-verify-nodebalancer.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="nodebalancers" FILTER="{\"label\":\"linodecluster-test-api-server\"}" make callLinodeApiGet | grep 'results": 1'
diff --git a/e2e/linodecluster-controller/minimal-linodecluster/04-delete-linodecluster.yaml b/e2e/linodecluster-controller/minimal-linodecluster/04-delete-linodecluster.yaml
new file mode 100644
index 00000000..b7187f64
--- /dev/null
+++ b/e2e/linodecluster-controller/minimal-linodecluster/04-delete-linodecluster.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: cluster.x-k8s.io/v1beta1
+  kind: Cluster
+  name: cluster-test
diff --git a/e2e/linodecluster-controller/minimal/04-error.yaml b/e2e/linodecluster-controller/minimal-linodecluster/04-error.yaml
similarity index 74%
rename from e2e/linodecluster-controller/minimal/04-error.yaml
rename to e2e/linodecluster-controller/minimal-linodecluster/04-error.yaml
index d0586b96..2a6b5d46 100644
--- a/e2e/linodecluster-controller/minimal/04-error.yaml
+++ b/e2e/linodecluster-controller/minimal-linodecluster/04-error.yaml
@@ -1,4 +1,4 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeCluster
 metadata:
-  name: linodecluster-sample
+  name: linodecluster-test
diff --git a/e2e/linodecluster-controller/minimal-linodecluster/05-verify-nodebalancer-destroyed.yaml b/e2e/linodecluster-controller/minimal-linodecluster/05-verify-nodebalancer-destroyed.yaml
new file mode 100644
index 00000000..c54597d2
--- /dev/null
+++ b/e2e/linodecluster-controller/minimal-linodecluster/05-verify-nodebalancer-destroyed.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="nodebalancers" FILTER="{\"tags\":\"linodecluster-test-api-server\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodecluster-controller/minimal/06-cleanup-cluster.yaml b/e2e/linodecluster-controller/minimal-linodecluster/06-cleanup-cluster.yaml
similarity index 74%
rename from e2e/linodecluster-controller/minimal/06-cleanup-cluster.yaml
rename to e2e/linodecluster-controller/minimal-linodecluster/06-cleanup-cluster.yaml
index c0eb3fb3..6738790b 100644
--- a/e2e/linodecluster-controller/minimal/06-cleanup-cluster.yaml
+++ b/e2e/linodecluster-controller/minimal-linodecluster/06-cleanup-cluster.yaml
@@ -1,5 +1,5 @@
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
-  name: cluster-sample
+  name: cluster-test
 spec:
diff --git a/e2e/linodecluster-controller/minimal/Makefile b/e2e/linodecluster-controller/minimal-linodecluster/Makefile
similarity index 100%
rename from e2e/linodecluster-controller/minimal/Makefile
rename to e2e/linodecluster-controller/minimal-linodecluster/Makefile
diff --git a/e2e/linodecluster-controller/minimal/03-verify-nodebalancer.yaml b/e2e/linodecluster-controller/minimal/03-verify-nodebalancer.yaml
deleted file mode 100644
index bd5d4cea..00000000
--- a/e2e/linodecluster-controller/minimal/03-verify-nodebalancer.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      URI="nodebalancers" FILTER="{\"tags\":\"$(OBJ=linodeclusters/linodecluster-sample make getKubeUid)\"}" make callLinodeApiGet | grep 'results": 1'
diff --git a/e2e/linodecluster-controller/minimal/04-delete-linodecluster.yaml b/e2e/linodecluster-controller/minimal/04-delete-linodecluster.yaml
deleted file mode 100644
index b8f20533..00000000
--- a/e2e/linodecluster-controller/minimal/04-delete-linodecluster.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-delete:
-- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-  kind: LinodeCluster
-  name: linodecluster-sample
diff --git a/e2e/linodecluster-controller/minimal/05-verify-nodebalancer-destroyed.yaml b/e2e/linodecluster-controller/minimal/05-verify-nodebalancer-destroyed.yaml
deleted file mode 100644
index 6eb1db62..00000000
--- a/e2e/linodecluster-controller/minimal/05-verify-nodebalancer-destroyed.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      URI="nodebalancers" FILTER="{\"tags\":\"$(OBJ=linodeclusters/linodecluster-sample make getKubeUid)\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodemachine-controller/byovpc/01-assert.yaml b/e2e/linodemachine-controller/byovpc/01-assert.yaml
deleted file mode 100644
index 04de738a..00000000
--- a/e2e/linodemachine-controller/byovpc/01-assert.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: LinodeVPC
-metadata:
-  annotations:
-    cluster.x-k8s.io/paused: "true"
-  name: linodevpc-sample
-status:
-  ready: true
diff --git a/e2e/linodemachine-controller/byovpc/01-create-cluster.yaml b/e2e/linodemachine-controller/byovpc/01-create-cluster.yaml
deleted file mode 100644
index 846a889e..00000000
--- a/e2e/linodemachine-controller/byovpc/01-create-cluster.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: make createVPC
-  - script: |-
-      cat <<EOF | kubectl apply -n $NAMESPACE -f -
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-      kind: LinodeVPC
-      metadata:
-        annotations:
-            cluster.x-k8s.io/paused: "true"
-        name: linodevpc-sample
-      spec:
-        label: capli-e2e-byovpc-for-all-tests
-        region: us-sea
-        vpcID: $(make fetchVPCID)
-      EOF
-  - command: make enableVPC
-  - script: |-
-      cat <<EOF | kubectl apply -n $NAMESPACE -f -
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-      kind: LinodeCluster
-      metadata:
-        annotations:
-          cluster.x-k8s.io/paused: "true"
-        name: linodecluster-sample
-      spec:
-        region: us-sea
-        vpcRef:
-          kind: LinodeVPC
-          name: linodevpc-sample
-          namespace: $NAMESPACE
-          uid: $(OBJ=linodevpcs/linodevpc-sample make getKubeUid)
-      ---
-      apiVersion: cluster.x-k8s.io/v1beta1
-      kind: Cluster
-      metadata:
-        annotations:
-          cluster.x-k8s.io/paused: "true"
-        name: cluster-sample
-      spec:
-        paused: true
-        infrastructureRef:
-          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-          kind: LinodeCluster
-          name: linodecluster-sample
-      ---
-      apiVersion: cluster.x-k8s.io/v1beta1
-      kind: Machine
-      metadata:
-        annotations:
-          cluster.x-k8s.io/paused: "true"
-        name: machine-sample
-      spec:
-        clusterName: cluster-sample
-        bootstrap:
-          configRef:
-            apiVersion: v1
-            kind: "ConfigMap"
-            name: "boostrap-sample"
-          dataSecretName: bootstrap-data-sample
-      ---
-      apiVersion: v1
-      kind: Secret
-      metadata:
-        name: bootstrap-data-sample
-      data:
-        value: dG91Y2ggL29rCg==
-      EOF
diff --git a/e2e/linodemachine-controller/byovpc/01-vpc-create-options.json b/e2e/linodemachine-controller/byovpc/01-vpc-create-options.json
deleted file mode 100644
index d3ecf6bb..00000000
--- a/e2e/linodemachine-controller/byovpc/01-vpc-create-options.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "label": "capli-e2e-byovpc-for-all-tests",
-    "region": "us-sea",
-    "subnets": [
-        {
-            "ipv4": "10.0.0.0/24",
-            "label": "capli-e2e-byovpc-for-all-tests"
-        }
-    ]
-}
diff --git a/e2e/linodemachine-controller/byovpc/02-assert.yaml b/e2e/linodemachine-controller/byovpc/02-assert.yaml
deleted file mode 100644
index 1cb14950..00000000
--- a/e2e/linodemachine-controller/byovpc/02-assert.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: LinodeMachine
-metadata:
-  name: linodemachine-sample
-spec:
-  region: us-sea
-  type: g5-nanode-1
-status:
-  ready: true
-  instanceState: running
diff --git a/e2e/linodemachine-controller/byovpc/02-create-linodemachine.yaml b/e2e/linodemachine-controller/byovpc/02-create-linodemachine.yaml
deleted file mode 100644
index aeb131b4..00000000
--- a/e2e/linodemachine-controller/byovpc/02-create-linodemachine.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      cat <<EOF | kubectl apply -n $NAMESPACE -f -
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-      kind: LinodeMachine
-      metadata:
-        ownerReferences:
-        - apiVersion: cluster.x-k8s.io/v1beta1
-          kind: Machine
-          name: machine-sample
-          uid: $(OBJ=machines/machine-sample make getKubeUid)
-        name: linodemachine-sample
-      spec:
-        region: us-sea
-        type: g5-nanode-1
-      EOF
diff --git a/e2e/linodemachine-controller/byovpc/03-delete-linodemachine.yaml b/e2e/linodemachine-controller/byovpc/03-delete-linodemachine.yaml
deleted file mode 100644
index 3bf5e64a..00000000
--- a/e2e/linodemachine-controller/byovpc/03-delete-linodemachine.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-delete:
-- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-  kind: LinodeMachine
-  name: linodemachine-sample
diff --git a/e2e/linodemachine-controller/byovpc/04-verify-linode-instance.yaml b/e2e/linodemachine-controller/byovpc/04-verify-linode-instance.yaml
deleted file mode 100644
index 4515f856..00000000
--- a/e2e/linodemachine-controller/byovpc/04-verify-linode-instance.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      URI="linode/instances" FILTER="{\"tags\":\"$(OBJ=linodemachines/linodemachine-sample make getKubeUid)\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodemachine-controller/byovpc/Makefile b/e2e/linodemachine-controller/byovpc/Makefile
deleted file mode 100644
index cbc1afab..00000000
--- a/e2e/linodemachine-controller/byovpc/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-include ../../Makefile
-
-createVPC:
-	@URI=vpcs FILTER='{"label":"capli-e2e-byovpc-for-all-tests"}' make --no-print-directory callLinodeApiGet | grep -v 'results": 0' ||\
-	URI=vpcs BODY='@01-vpc-create-options.json' make --no-print-directory callLinodeApiPost
-
-enableVPC:
-	PATCH='{"status":{"ready":true}}' OBJ="linodevpcs/linodevpc-sample" make --no-print-directory patchKubeObjStatus
-
-fetchVPCID:
-	@URI=vpcs FILTER='{"label":"capli-e2e-byovpc-for-all-tests"}' make --no-print-directory callLinodeApiGet | jq -r .data[0].id
diff --git a/e2e/linodemachine-controller/byovpc/00-assert.yaml b/e2e/linodemachine-controller/minimal-linodemachine/00-assert.yaml
similarity index 100%
rename from e2e/linodemachine-controller/byovpc/00-assert.yaml
rename to e2e/linodemachine-controller/minimal-linodemachine/00-assert.yaml
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/01-create-cluster.yaml b/e2e/linodemachine-controller/minimal-linodemachine/01-create-cluster.yaml
new file mode 100644
index 00000000..ec2e8e0f
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/01-create-cluster.yaml
@@ -0,0 +1,21 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: linodemachine-cluster-test
+spec:
+  controlPlaneRef:
+    apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+    kind: KubeadmControlPlane
+    name: linodecluster-test-control-plane
+  infrastructureRef:
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+    kind: LinodeCluster
+    name: linodemachine-test
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeCluster
+metadata:
+  name: linodemachine-test
+spec:
+  region: us-sea
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/02-assert.yaml b/e2e/linodemachine-controller/minimal-linodemachine/02-assert.yaml
new file mode 100644
index 00000000..677b2a33
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/02-assert.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachine
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: linodemachine-cluster-test
+spec:
+  region: us-sea
+  type: g5-nanode-1
+status:
+  ready: true
+  instanceState: running
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Machine
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: linodemachine-cluster-test
+spec:
+  clusterName: linodemachine-cluster-test
+status:
+  bootstrapReady: true
+  infrastructureReady: true
\ No newline at end of file
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/02-create-linodemachine.yaml b/e2e/linodemachine-controller/minimal-linodemachine/02-create-linodemachine.yaml
new file mode 100644
index 00000000..a1105de8
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/02-create-linodemachine.yaml
@@ -0,0 +1,32 @@
+---
+apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+kind: KubeadmControlPlane
+metadata:
+    name: linodecluster-test-control-plane
+spec:
+    kubeadmConfigSpec:
+        clusterConfiguration:
+            apiServer:
+                extraArgs:
+                    cloud-provider: external
+            controllerManager:
+                extraArgs:
+                    cloud-provider: external
+    machineTemplate:
+        infrastructureRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+            kind: LinodeMachineTemplate
+            name: linodemachine-test
+    replicas: 1
+    version: 1.29.1
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachineTemplate
+metadata:
+    name: linodemachine-test
+spec:
+    template:
+        spec:
+            region: us-sea
+            type: g5-nanode-1
+
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/03-verify-linode-instance.yaml b/e2e/linodemachine-controller/minimal-linodemachine/03-verify-linode-instance.yaml
new file mode 100644
index 00000000..d66fc11f
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/03-verify-linode-instance.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="linode/instances" FILTER="{\"tags\":\"linodemachine-test\"}" make callLinodeApiGet | grep 'results": 1'
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/04-delete-cluster.yaml b/e2e/linodemachine-controller/minimal-linodemachine/04-delete-cluster.yaml
new file mode 100644
index 00000000..990e7f3d
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/04-delete-cluster.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: cluster.x-k8s.io/v1beta1
+  kind: Cluster
+  name: linodemachine-cluster-test
diff --git a/e2e/linodemachine-controller/byovpc/03-error.yaml b/e2e/linodemachine-controller/minimal-linodemachine/04-error.yaml
similarity index 74%
rename from e2e/linodemachine-controller/byovpc/03-error.yaml
rename to e2e/linodemachine-controller/minimal-linodemachine/04-error.yaml
index 4ff1b308..734f65a1 100644
--- a/e2e/linodemachine-controller/byovpc/03-error.yaml
+++ b/e2e/linodemachine-controller/minimal-linodemachine/04-error.yaml
@@ -1,4 +1,4 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeMachine
 metadata:
-  name: linodemachine-sample
+  name: linodemachine-test
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/05-verify-no-linode-instance.yaml b/e2e/linodemachine-controller/minimal-linodemachine/05-verify-no-linode-instance.yaml
new file mode 100644
index 00000000..7896d548
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/05-verify-no-linode-instance.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="linode/instances" FILTER="{\"tags\":\"linodecluster-test\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodemachine-controller/minimal-linodemachine/06-cleanup-cluster.yaml b/e2e/linodemachine-controller/minimal-linodemachine/06-cleanup-cluster.yaml
new file mode 100644
index 00000000..6738790b
--- /dev/null
+++ b/e2e/linodemachine-controller/minimal-linodemachine/06-cleanup-cluster.yaml
@@ -0,0 +1,5 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: cluster-test
+spec:
diff --git a/e2e/linodemachine-controller/minimal/Makefile b/e2e/linodemachine-controller/minimal-linodemachine/Makefile
similarity index 100%
rename from e2e/linodemachine-controller/minimal/Makefile
rename to e2e/linodemachine-controller/minimal-linodemachine/Makefile
diff --git a/e2e/linodemachine-controller/minimal/01-create-cluster.yaml b/e2e/linodemachine-controller/minimal/01-create-cluster.yaml
deleted file mode 100644
index 74ae0aac..00000000
--- a/e2e/linodemachine-controller/minimal/01-create-cluster.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: LinodeCluster
-metadata:
-  annotations:
-    cluster.x-k8s.io/paused: "true"
-  name: linodecluster-sample
-spec:
-  region: us-sea
----
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: Cluster
-metadata:
-  annotations:
-    cluster.x-k8s.io/paused: "true"
-  name: cluster-sample
-spec:
-  paused: true
-  infrastructureRef:
-    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-    kind: LinodeCluster
-    name: linodecluster-sample
----
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: Machine
-metadata:
-  annotations:
-    cluster.x-k8s.io/paused: "true"
-  name: machine-sample
-spec:
-  clusterName: cluster-sample
-  bootstrap:
-    configRef:
-      apiVersion: v1
-      kind: "ConfigMap"
-      name: "boostrap-sample"
-    dataSecretName: bootstrap-data-sample
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: bootstrap-data-sample
-data:
-  value: dG91Y2ggL29rCg==
diff --git a/e2e/linodemachine-controller/minimal/02-assert.yaml b/e2e/linodemachine-controller/minimal/02-assert.yaml
deleted file mode 100644
index 1cb14950..00000000
--- a/e2e/linodemachine-controller/minimal/02-assert.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: LinodeMachine
-metadata:
-  name: linodemachine-sample
-spec:
-  region: us-sea
-  type: g5-nanode-1
-status:
-  ready: true
-  instanceState: running
diff --git a/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml b/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml
deleted file mode 100644
index aeb131b4..00000000
--- a/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      cat <<EOF | kubectl apply -n $NAMESPACE -f -
-      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-      kind: LinodeMachine
-      metadata:
-        ownerReferences:
-        - apiVersion: cluster.x-k8s.io/v1beta1
-          kind: Machine
-          name: machine-sample
-          uid: $(OBJ=machines/machine-sample make getKubeUid)
-        name: linodemachine-sample
-      spec:
-        region: us-sea
-        type: g5-nanode-1
-      EOF
diff --git a/e2e/linodemachine-controller/minimal/03-delete-linodemachine.yaml b/e2e/linodemachine-controller/minimal/03-delete-linodemachine.yaml
deleted file mode 100644
index 3bf5e64a..00000000
--- a/e2e/linodemachine-controller/minimal/03-delete-linodemachine.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-delete:
-- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-  kind: LinodeMachine
-  name: linodemachine-sample
diff --git a/e2e/linodemachine-controller/minimal/04-verify-linode-instance.yaml b/e2e/linodemachine-controller/minimal/04-verify-linode-instance.yaml
deleted file mode 100644
index 4515f856..00000000
--- a/e2e/linodemachine-controller/minimal/04-verify-linode-instance.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      URI="linode/instances" FILTER="{\"tags\":\"$(OBJ=linodemachines/linodemachine-sample make getKubeUid)\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodemachine-controller/minimal/00-assert.yaml b/e2e/linodemachine-controller/vpc-integration/00-assert.yaml
similarity index 100%
rename from e2e/linodemachine-controller/minimal/00-assert.yaml
rename to e2e/linodemachine-controller/vpc-integration/00-assert.yaml
diff --git a/e2e/linodevpc-controller/minimal/01-assert.yaml b/e2e/linodemachine-controller/vpc-integration/01-assert.yaml
similarity index 68%
rename from e2e/linodevpc-controller/minimal/01-assert.yaml
rename to e2e/linodemachine-controller/vpc-integration/01-assert.yaml
index b3a9cd76..9a9e0b33 100644
--- a/e2e/linodevpc-controller/minimal/01-assert.yaml
+++ b/e2e/linodemachine-controller/vpc-integration/01-assert.yaml
@@ -1,9 +1,8 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeVPC
 metadata:
-  name: linodevpc-sample
+  name: machine-test-vpc
 spec:
-  label: capli-e2e-byovpc-sample
   region: us-sea
 status:
   ready: true
diff --git a/e2e/linodemachine-controller/vpc-integration/01-create-cluster.yaml b/e2e/linodemachine-controller/vpc-integration/01-create-cluster.yaml
new file mode 100644
index 00000000..0e83297f
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/01-create-cluster.yaml
@@ -0,0 +1,34 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+    name: vpc-cluster-test
+spec:
+    controlPlaneRef:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlane
+        name: linodecluster-test-control-plane
+    infrastructureRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+        kind: LinodeCluster
+        name: vpc-machine-test
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeCluster
+metadata:
+    name: vpc-machine-test
+spec:
+    region: us-sea
+    vpcRef:
+        kind: LinodeVPC
+        name: machine-test-vpc
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeVPC
+metadata:
+    name: machine-test-vpc
+spec:
+    region: us-sea
+    subnets:
+        - label: test-subnet
+          ipv4: 10.0.0.0/24
diff --git a/e2e/linodemachine-controller/vpc-integration/02-assert.yaml b/e2e/linodemachine-controller/vpc-integration/02-assert.yaml
new file mode 100644
index 00000000..dc0f49a2
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/02-assert.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachine
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: vpc-cluster-test
+spec:
+  region: us-sea
+  type: g5-nanode-1
+status:
+  ready: true
+  instanceState: running
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Machine
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: vpc-cluster-test
+spec:
+  clusterName: vpc-cluster-test
+status:
+  bootstrapReady: true
+  infrastructureReady: true
\ No newline at end of file
diff --git a/e2e/linodemachine-controller/vpc-integration/02-create-linodemachine.yaml b/e2e/linodemachine-controller/vpc-integration/02-create-linodemachine.yaml
new file mode 100644
index 00000000..a1105de8
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/02-create-linodemachine.yaml
@@ -0,0 +1,32 @@
+---
+apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+kind: KubeadmControlPlane
+metadata:
+    name: linodecluster-test-control-plane
+spec:
+    kubeadmConfigSpec:
+        clusterConfiguration:
+            apiServer:
+                extraArgs:
+                    cloud-provider: external
+            controllerManager:
+                extraArgs:
+                    cloud-provider: external
+    machineTemplate:
+        infrastructureRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+            kind: LinodeMachineTemplate
+            name: linodemachine-test
+    replicas: 1
+    version: 1.29.1
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachineTemplate
+metadata:
+    name: linodemachine-test
+spec:
+    template:
+        spec:
+            region: us-sea
+            type: g5-nanode-1
+
diff --git a/e2e/linodemachine-controller/vpc-integration/03-verify-linode-instance.yaml b/e2e/linodemachine-controller/vpc-integration/03-verify-linode-instance.yaml
new file mode 100644
index 00000000..5bb0b7d6
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/03-verify-linode-instance.yaml
@@ -0,0 +1,7 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="linode/instances" FILTER="{\"tags\":\"vpc-machine-test\"}" make callLinodeApiGet | grep 'results": 1'
+  - script: |-
+      URI="vpcs" FILTER="{\"label\":\"machine-test-vpc\"}" make callLinodeApiGet | grep 'active": true'
diff --git a/e2e/linodemachine-controller/vpc-integration/04-delete-cluster.yaml b/e2e/linodemachine-controller/vpc-integration/04-delete-cluster.yaml
new file mode 100644
index 00000000..e0d37d2e
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/04-delete-cluster.yaml
@@ -0,0 +1,9 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+- apiVersion: cluster.x-k8s.io/v1beta1
+  kind: Cluster
+  name: vpc-cluster-test
+- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+  kind: LinodeVPC
+  name: machine-test-vpc
diff --git a/e2e/linodemachine-controller/vpc-integration/04-error.yaml b/e2e/linodemachine-controller/vpc-integration/04-error.yaml
new file mode 100644
index 00000000..e4169a68
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/04-error.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachine
+metadata:
+  name: linodemachine-test
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeVPC
+metadata:
+  name: machine-test-vpc
\ No newline at end of file
diff --git a/e2e/linodemachine-controller/vpc-integration/05-verify-no-linode-instance.yaml b/e2e/linodemachine-controller/vpc-integration/05-verify-no-linode-instance.yaml
new file mode 100644
index 00000000..738a9e44
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/05-verify-no-linode-instance.yaml
@@ -0,0 +1,7 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="linode/instances" FILTER="{\"tags\":\"linodecluster-test\"}" make callLinodeApiGet | grep 'results": 0'
+  - script: |-
+      URI="vpcs" FILTER="{\"label\":\"linodevpc-test\"}" make callLinodeApiGet | grep 'results": 0'
\ No newline at end of file
diff --git a/e2e/linodemachine-controller/vpc-integration/06-cleanup-cluster.yaml b/e2e/linodemachine-controller/vpc-integration/06-cleanup-cluster.yaml
new file mode 100644
index 00000000..6738790b
--- /dev/null
+++ b/e2e/linodemachine-controller/vpc-integration/06-cleanup-cluster.yaml
@@ -0,0 +1,5 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: cluster-test
+spec:
diff --git a/e2e/linodevpc-controller/minimal/Makefile b/e2e/linodemachine-controller/vpc-integration/Makefile
similarity index 100%
rename from e2e/linodevpc-controller/minimal/Makefile
rename to e2e/linodemachine-controller/vpc-integration/Makefile
diff --git a/e2e/linodevpc-controller/minimal/00-assert.yaml b/e2e/linodevpc-controller/minimal-linodevpc/00-assert.yaml
similarity index 100%
rename from e2e/linodevpc-controller/minimal/00-assert.yaml
rename to e2e/linodevpc-controller/minimal-linodevpc/00-assert.yaml
diff --git a/e2e/linodevpc-controller/minimal/02-error.yaml b/e2e/linodevpc-controller/minimal-linodevpc/01-assert.yaml
similarity index 63%
rename from e2e/linodevpc-controller/minimal/02-error.yaml
rename to e2e/linodevpc-controller/minimal-linodevpc/01-assert.yaml
index f71a29b6..2dc3d1a4 100644
--- a/e2e/linodevpc-controller/minimal/02-error.yaml
+++ b/e2e/linodevpc-controller/minimal-linodevpc/01-assert.yaml
@@ -1,7 +1,8 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeVPC
 metadata:
-  name: linodevpc-sample
+  name: linodevpc-test
 spec:
-  label: capli-e2e-byovpc-sample
   region: us-sea
+status:
+  ready: true
diff --git a/e2e/linodevpc-controller/minimal/01-create-vpc.yaml b/e2e/linodevpc-controller/minimal-linodevpc/01-create-vpc.yaml
similarity index 63%
rename from e2e/linodevpc-controller/minimal/01-create-vpc.yaml
rename to e2e/linodevpc-controller/minimal-linodevpc/01-create-vpc.yaml
index f71a29b6..d4048a55 100644
--- a/e2e/linodevpc-controller/minimal/01-create-vpc.yaml
+++ b/e2e/linodevpc-controller/minimal-linodevpc/01-create-vpc.yaml
@@ -1,7 +1,6 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
 kind: LinodeVPC
 metadata:
-  name: linodevpc-sample
+  name: linodevpc-test
 spec:
-  label: capli-e2e-byovpc-sample
   region: us-sea
diff --git a/e2e/linodevpc-controller/minimal-linodevpc/02-verify-vpc.yaml b/e2e/linodevpc-controller/minimal-linodevpc/02-verify-vpc.yaml
new file mode 100644
index 00000000..79be41c5
--- /dev/null
+++ b/e2e/linodevpc-controller/minimal-linodevpc/02-verify-vpc.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="vpcs" FILTER="{\"label\":\"linodevpc-test\"}" make callLinodeApiGet | grep 'results": 1'
diff --git a/e2e/linodevpc-controller/minimal/02-delete-vpc.yaml b/e2e/linodevpc-controller/minimal-linodevpc/03-delete-vpc.yaml
similarity index 83%
rename from e2e/linodevpc-controller/minimal/02-delete-vpc.yaml
rename to e2e/linodevpc-controller/minimal-linodevpc/03-delete-vpc.yaml
index 193c292f..ba268073 100644
--- a/e2e/linodevpc-controller/minimal/02-delete-vpc.yaml
+++ b/e2e/linodevpc-controller/minimal-linodevpc/03-delete-vpc.yaml
@@ -3,4 +3,4 @@ kind: TestStep
 delete:
 - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
   kind: LinodeVPC
-  name: linodevpc-sample
+  name: linodevpc-test
diff --git a/e2e/linodemachine-controller/minimal/03-error.yaml b/e2e/linodevpc-controller/minimal-linodevpc/03-error.yaml
similarity index 50%
rename from e2e/linodemachine-controller/minimal/03-error.yaml
rename to e2e/linodevpc-controller/minimal-linodevpc/03-error.yaml
index 4ff1b308..d4048a55 100644
--- a/e2e/linodemachine-controller/minimal/03-error.yaml
+++ b/e2e/linodevpc-controller/minimal-linodevpc/03-error.yaml
@@ -1,4 +1,6 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: LinodeMachine
+kind: LinodeVPC
 metadata:
-  name: linodemachine-sample
+  name: linodevpc-test
+spec:
+  region: us-sea
diff --git a/e2e/linodevpc-controller/minimal-linodevpc/04-verify-no-vpc.yaml b/e2e/linodevpc-controller/minimal-linodevpc/04-verify-no-vpc.yaml
new file mode 100644
index 00000000..a089b10f
--- /dev/null
+++ b/e2e/linodevpc-controller/minimal-linodevpc/04-verify-no-vpc.yaml
@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      URI="vpcs" FILTER="{\"label\":\"linodevpc-test\"}" make callLinodeApiGet | grep 'results": 0'
diff --git a/e2e/linodevpc-controller/minimal-linodevpc/Makefile b/e2e/linodevpc-controller/minimal-linodevpc/Makefile
new file mode 100644
index 00000000..3924bfdc
--- /dev/null
+++ b/e2e/linodevpc-controller/minimal-linodevpc/Makefile
@@ -0,0 +1 @@
+include ../../Makefile
diff --git a/e2e/linodevpc-controller/minimal/03-verify-vpc.yaml b/e2e/linodevpc-controller/minimal/03-verify-vpc.yaml
deleted file mode 100644
index d9a05761..00000000
--- a/e2e/linodevpc-controller/minimal/03-verify-vpc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |-
-      URI="vpcs" FILTER="{\"label\":\"$(OBJ=linodevpcs/linodevpc-sample make getKubeLabel)\"}" make callLinodeApiGet | grep 'results": 0'