diff --git a/e2e/csi/csi.go b/e2e/csi/csi.go
index 4f17b4195..1dc357a39 100644
--- a/e2e/csi/csi.go
+++ b/e2e/csi/csi.go
@@ -42,7 +42,7 @@ func init() {
 
 const ns = ""
 
-var pluginWait = &e2e.WaitConfig{Interval: 5 * time.Second, Retries: 24} // 2min
+var pluginWait = &e2e.WaitConfig{Interval: 5 * time.Second, Retries: 36} // 3min
 var reapWait = &e2e.WaitConfig{Interval: 5 * time.Second, Retries: 36}   // 3min
 
 func (tc *CSIVolumesTest) BeforeAll(f *framework.F) {
diff --git a/e2e/csi/input/plugin-aws-ebs-controller.nomad b/e2e/csi/input/plugin-aws-ebs-controller.nomad
index 4ea91cb24..eefcfbca1 100644
--- a/e2e/csi/input/plugin-aws-ebs-controller.nomad
+++ b/e2e/csi/input/plugin-aws-ebs-controller.nomad
@@ -22,7 +22,7 @@ job "plugin-aws-ebs-controller" {
       driver = "docker"
 
       config {
-        image = "amazon/aws-ebs-csi-driver:v0.6.0"
+        image = "amazon/aws-ebs-csi-driver:v0.7.1"
 
         args = [
           "controller",
diff --git a/e2e/csi/input/plugin-aws-ebs-nodes.nomad b/e2e/csi/input/plugin-aws-ebs-nodes.nomad
index abfd4e7ab..6c2f37038 100644
--- a/e2e/csi/input/plugin-aws-ebs-nodes.nomad
+++ b/e2e/csi/input/plugin-aws-ebs-nodes.nomad
@@ -19,7 +19,7 @@ job "plugin-aws-ebs-nodes" {
       driver = "docker"
 
       config {
-        image = "amazon/aws-ebs-csi-driver:v0.6.0"
+        image = "amazon/aws-ebs-csi-driver:v0.7.1"
 
         args = [
           "node",