diff --git a/enos/enos-scenario-upgrade.hcl b/enos/enos-scenario-upgrade.hcl
index 6b66bf711..369519637 100644
--- a/enos/enos-scenario-upgrade.hcl
+++ b/enos/enos-scenario-upgrade.hcl
@@ -142,19 +142,20 @@ scenario "upgrade" {
         batch_raw_exec   = { job_spec = "jobs/raw-exec-batch.nomad.hcl", alloc_count = 3, type = "batch" }
         system_raw_exec  = { job_spec = "jobs/raw-exec-system.nomad.hcl", alloc_count = 0, type = "system" }
 
-        csi_plugin_efs_node = {
-          job_spec    = "jobs/plugin-aws-efs-nodes.nomad.hcl"
-          alloc_count = 0
-          type        = "system"
-          post_script = "scripts/wait_for_efs_plugin.sh"
-        }
+        # TODO(tgross): temporarily disabled while this gets redesigned
+        # csi_plugin_efs_node = {
+        #   job_spec    = "jobs/plugin-aws-efs-nodes.nomad.hcl"
+        #   alloc_count = 0
+        #   type        = "system"
+        #   post_script = "scripts/wait_for_efs_plugin.sh"
+        # }
 
-        wants_csi = {
-          job_spec    = "jobs/wants-volume.nomad.hcl"
-          alloc_count = 1
-          type        = "service"
-          pre_script  = "scripts/wait_for_efs_volume.sh"
-        }
+        # wants_csi = {
+        #   job_spec    = "jobs/wants-volume.nomad.hcl"
+        #   alloc_count = 1
+        #   type        = "service"
+        #   pre_script  = "scripts/wait_for_efs_volume.sh"
+        # }
 
       }
     }