diff --git a/e2e/exec2/input/countdash.hcl b/e2e/exec2/input/countdash.hcl
index f2cea8f40..b29e4d21c 100644
--- a/e2e/exec2/input/countdash.hcl
+++ b/e2e/exec2/input/countdash.hcl
@@ -30,10 +30,7 @@ job "countdash" {
               "${meta.connect.proxy_concurrency}",
               "--disable-hot-restart"
             ]
-            # TODO(shoenig) should not need NOMAD_ values once
-            # https://github.com/hashicorp/nomad-driver-exec2/issues/29 is
-            # fixed.
-            unveil = ["rx:/opt/bin", "rwc:/dev/shm", "r:${NOMAD_TASK_DIR}", "r:${NOMAD_SECRETS_DIR}"]
+            unveil = ["rx:/opt/bin", "rwc:/dev/shm"]
           }
 
           resources {
@@ -90,10 +87,7 @@ job "countdash" {
               "${meta.connect.proxy_concurrency}",
               "--disable-hot-restart"
             ]
-            # TODO(shoenig) should not need NOMAD_ values once
-            # https://github.com/hashicorp/nomad-driver-exec2/issues/29 is
-            # fixed.
-            unveil = ["rx:/opt/bin", "rwc:/dev/shm", "r:${NOMAD_TASK_DIR}", "r:${NOMAD_SECRETS_DIR}"]
+            unveil = ["rx:/opt/bin", "rwc:/dev/shm"]
           }
 
           resources {
diff --git a/e2e/exec2/input/env.hcl b/e2e/exec2/input/env.hcl
index 1dd2fa95c..6e74da4bb 100644
--- a/e2e/exec2/input/env.hcl
+++ b/e2e/exec2/input/env.hcl
@@ -12,11 +12,6 @@ job "env" {
   }
 
   group "group" {
-    reschedule {
-      attempts  = 0
-      unlimited = false
-    }
-
     restart {
       attempts = 0
       mode     = "fail"
diff --git a/e2e/exec2/input/secrets.hcl b/e2e/exec2/input/secrets.hcl
index 62b37c4c7..c85b77b6f 100644
--- a/e2e/exec2/input/secrets.hcl
+++ b/e2e/exec2/input/secrets.hcl
@@ -13,11 +13,6 @@ job "secrets" {
   }
 
   group "group" {
-    reschedule {
-      attempts  = 0
-      unlimited = false
-    }
-
     restart {
       attempts = 0
       mode     = "fail"
@@ -31,11 +26,6 @@ job "secrets" {
       config {
         command = "cat"
         args    = ["${NOMAD_SECRETS_DIR}/nomad_token"]
-
-        # TODO(shoenig) should not need NOMAD_ values once
-        # https://github.com/hashicorp/nomad-driver-exec2/issues/29 is
-        # fixed.
-        unveil = ["r:${NOMAD_SECRETS_DIR}"]
       }
       resources {
         cpu    = 100
@@ -52,11 +42,6 @@ job "secrets" {
       config {
         command = "bash"
         args    = ["-c", "echo abc123 > ${NOMAD_SECRETS_DIR}/password.txt && cat ${NOMAD_SECRETS_DIR}/password.txt"]
-
-        # TODO(shoenig) should not need NOMAD_ values once
-        # https://github.com/hashicorp/nomad-driver-exec2/issues/29 is
-        # fixed.
-        unveil = ["rwc:${NOMAD_SECRETS_DIR}"]
       }
       resources {
         cpu    = 100
diff --git a/e2e/terraform/packer/ubuntu-jammy-amd64/setup.sh b/e2e/terraform/packer/ubuntu-jammy-amd64/setup.sh
index c8fa3dd14..32f6cdbe1 100755
--- a/e2e/terraform/packer/ubuntu-jammy-amd64/setup.sh
+++ b/e2e/terraform/packer/ubuntu-jammy-amd64/setup.sh
@@ -132,7 +132,7 @@ sudo chmod +x ${NOMAD_PLUGIN_DIR}/nomad-driver-exec2
 
 # Envoy
 echo "Installing Envoy"
-sudo curl -s -S -L -o /opt/bin/envoy https://github.com/envoyproxy/envoy/releases/download/v1.29.4/envoy-1.29.4-linux-x86_64
+sudo curl -s -S -L -o /opt/bin/envoy https://github.com/envoyproxy/envoy/releases/download/v1.34.1/envoy-1.34.1-linux-x86_64
 sudo chmod +x /opt/bin/envoy
 
 echo "Updating boot parameters"