diff --git a/dev/docker-clients/client.nomad b/dev/docker-clients/client.nomad
index 72c5fe8d2..4689df775 100644
--- a/dev/docker-clients/client.nomad
+++ b/dev/docker-clients/client.nomad
@@ -18,8 +18,8 @@ job "client" {
       }
 
       resources {
-        cpu    = 300 # 500 MHz
-        memory = 100 # 256MB
+        cpu    = 300
+        memory = 100
 
         network {
           mbits = 10
@@ -29,19 +29,20 @@ job "client" {
 
       template {
         data = <<EOF
-log_level = "DEBUG"
-data_dir = "/tmp/client{{ env "NOMAD_ALLOC_INDEX" }}"
-name = "client-{{ env "NOMAD_ALLOC_INDEX" }}"
+log_level    = "DEBUG"
+data_dir     = "/tmp/nomad-client{{ env "NOMAD_ALLOC_INDEX" }}"
+name         = "client-{{ env "NOMAD_ALLOC_INDEX" }}"
+enable_debug = true
 client {
-	enabled = true
-	servers = ["127.0.0.1:4647"]
-	options {
-	  "driver.raw_exec.enable" = "1"
-    }
+  enabled = true
+  servers = ["127.0.0.1:4647"]
+  options {
+    "driver.raw_exec.enable" = "1"
+  }
 }
 
 ports {
-	http = {{ env "NOMAD_PORT_http" }}
+  http = {{ env "NOMAD_PORT_http" }}
 }
 	 EOF
 
diff --git a/dev/docker-clients/persistent.hcl b/dev/docker-clients/persistent.hcl
index 50d2897cc..e4ea22b55 100644
--- a/dev/docker-clients/persistent.hcl
+++ b/dev/docker-clients/persistent.hcl
@@ -1,16 +1,16 @@
 log_level = "DEBUG"
-data_dir = "/tmp/server"
+data_dir = "/tmp/nomad-server"
 
 server {
-    enabled = true
+  enabled = true
 
-    # Self-elect, should be 3 or 5 for production
-    bootstrap_expect = 1
+  # Self-elect, should be 3 or 5 for production
+  bootstrap_expect = 1
 }
 
 client {
-    enabled = true
-    options {
-        "docker.privileged.enabled" = "true"
-    }
+  enabled = true
+  options {
+    "docker.privileged.enabled" = "true"
+  }
 }