diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f88977b..53d6dec3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,6 +44,7 @@ jobs:
       LINODE_CONTROL_PLANE_MACHINE_TYPE: g6-standard-2
       LINODE_MACHINE_TYPE: g6-standard-2
       WORKER_NODES: ${{ github.ref == 'refs/heads/main' && '3' || '0' }}
+      E2E_SELECTOR: ${{ github.ref == 'refs/heads/main' && 'all' || 'quick' }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -68,8 +69,6 @@ jobs:
         run: devbox run mgmt-and-capl-cluster
 
       - name: Run E2E Tests
-        env:
-          E2E_SELECTOR: ${{ github.ref == 'refs/heads/main' && 'all' || 'quick' }}
         run: devbox run e2e-test
 
       - name: Run CSI-Sanity Tests
diff --git a/tests/e2e/test/pod-pvc-luks-mov-volume/chainsaw-test.yaml b/tests/e2e/test/pod-pvc-luks-mov-volume/chainsaw-test.yaml
index 8c445dd7..ef9b7a83 100644
--- a/tests/e2e/test/pod-pvc-luks-mov-volume/chainsaw-test.yaml
+++ b/tests/e2e/test/pod-pvc-luks-mov-volume/chainsaw-test.yaml
@@ -12,6 +12,7 @@ metadata:
   name: pod-pvc-luks-mov-volume
   labels:
     all:
+    volumemove:
 spec:
   bindings:
     - name: lukskey
@@ -110,10 +111,10 @@ spec:
       try:
         - patch:
             resource:
-              apiVersion: v1
+              apiVersion: apps/v1
               kind: StatefulSet
               metadata:
-              name: test-statefulset
+                name: test-statefulset
               spec:
                 template:
                   spec:
@@ -124,6 +125,16 @@ spec:
                           - matchExpressions:
                             - key: node-role.kubernetes.io/control-plane
                               operator: DoesNotExist
+    - name: Rollout restart the statefulset
+      try:
+        - script:
+            env:
+              - name: NAMESPACE
+                value: ($namespace)
+            content: |
+              kubectl rollout restart statefulset test-statefulset -n $NAMESPACE
+            check:
+              ($error): ~
     - name: Check if Pod is ready and Volume is mounted (On worker node)
       try:
         - assert:
@@ -176,7 +187,7 @@ spec:
       try:
         - patch:
             resource:
-              apiVersion: v1
+              apiVersion: apps/v1
               kind: StatefulSet
               metadata:
                 name: test-statefulset
@@ -194,6 +205,16 @@ spec:
                     - key: "node-role.kubernetes.io/control-plane"
                       operator: "Exists"
                       effect: "NoSchedule"
+    - name: Rollout restart the statefulset
+      try:
+        - script:
+            env:
+              - name: NAMESPACE
+                value: ($namespace)
+            content: |
+              kubectl rollout restart statefulset test-statefulset -n $NAMESPACE
+            check:
+              ($error): ~
     - name: Check if Pod is ready and Volume is mounted (after moving back to control plane node)
       try:
         - assert:
@@ -246,7 +267,7 @@ spec:
       try:
         - delete:
             ref:
-              apiVersion: v1
+              apiVersion: apps/v1
               kind: StatefulSet
     - name: Check if the volume is detached on Node resource and in Linode (using API)
       try:
diff --git a/tests/e2e/test/pod-pvc-luks-mov-volume/create-storage-class-statefulset.yaml b/tests/e2e/test/pod-pvc-luks-mov-volume/create-storage-class-statefulset.yaml
index 0e75e294..737cc09b 100644
--- a/tests/e2e/test/pod-pvc-luks-mov-volume/create-storage-class-statefulset.yaml
+++ b/tests/e2e/test/pod-pvc-luks-mov-volume/create-storage-class-statefulset.yaml
@@ -38,7 +38,7 @@ spec:
       labels:
         app: example
     spec:
-      ffinity:
+      affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms: