diff --git a/e2e/terraform/config/dev-cluster/nomad/client-linux/client.hcl b/e2e/terraform/config/dev-cluster/nomad/client-linux/client.hcl
index 34ab5996a..439aa72f3 100644
--- a/e2e/terraform/config/dev-cluster/nomad/client-linux/client.hcl
+++ b/e2e/terraform/config/dev-cluster/nomad/client-linux/client.hcl
@@ -15,7 +15,7 @@ client {
   }
 
   host_volume "shared_data" {
-    path = "/tmp/data"
+    path = "/srv/data"
   }
 }
 
diff --git a/e2e/terraform/config/full-cluster/nomad/client-linux/indexed/client-0.hcl b/e2e/terraform/config/full-cluster/nomad/client-linux/indexed/client-0.hcl
index e13ffd37f..192692cbd 100644
--- a/e2e/terraform/config/full-cluster/nomad/client-linux/indexed/client-0.hcl
+++ b/e2e/terraform/config/full-cluster/nomad/client-linux/indexed/client-0.hcl
@@ -12,7 +12,7 @@ client {
   }
 
   host_volume "shared_data" {
-    path = "/tmp/data"
+    path = "/srv/data"
   }
 }
 
diff --git a/e2e/terraform/packer/ubuntu-bionic-amd64/nomad.service b/e2e/terraform/packer/ubuntu-bionic-amd64/nomad.service
index a4ea35a09..2e9c56097 100644
--- a/e2e/terraform/packer/ubuntu-bionic-amd64/nomad.service
+++ b/e2e/terraform/packer/ubuntu-bionic-amd64/nomad.service
@@ -2,6 +2,7 @@
 Description=Nomad Agent
 Requires=network-online.target
 After=network-online.target
+StartLimitIntervalSec=10
 
 [Service]
 ExecReload=/bin/kill -HUP $MAINPID
@@ -13,9 +14,7 @@ LimitNPROC=infinity
 TasksMax=infinity
 Restart=on-failure
 RestartSec=2
-StartLimitIntervalSec=10
 StartLimitBurst=3
 
-
 [Install]
 WantedBy=multi-user.target
diff --git a/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh b/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh
index 7d9e15e83..8c9db159d 100755
--- a/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh
+++ b/e2e/terraform/packer/ubuntu-bionic-amd64/setup.sh
@@ -24,9 +24,11 @@ sudo mkdir -p /ops/shared
 sudo chown -R ubuntu:ubuntu /ops/shared
 
 mkdir_for_root /opt
+mkdir_for_root /srv/data # for host volumes
 
 # Dependencies
 sudo apt-get update
+sudo apt-get upgrade -y
 sudo apt-get install -y \
      software-properties-common \
      dnsmasq unzip tree redis-tools jq curl tmux awscli nfs-common \
diff --git a/e2e/terraform/userdata/ubuntu-bionic.sh b/e2e/terraform/userdata/ubuntu-bionic.sh
index b57cc4f9e..a0d28f84d 100755
--- a/e2e/terraform/userdata/ubuntu-bionic.sh
+++ b/e2e/terraform/userdata/ubuntu-bionic.sh
@@ -14,9 +14,6 @@ nameserver $DOCKER_BRIDGE_IP_ADDRESS
 EOF
 sudo mv /tmp/resolv.conf /etc/resolv.conf
 
-# For host volume testing
-sudo mkdir -p /tmp/data
-
 # need to get the interface for dnsmasq config so that we can
 # accomodate both "predictable" and old-style interface names
 IFACE=$(/usr/local/bin/sockaddr eval 'GetDefaultInterfaces | attr "Name"')