diff --git a/dev/cluster/client1.hcl b/dev/cluster/client1.hcl
new file mode 100644
index 000000000..93db926b7
--- /dev/null
+++ b/dev/cluster/client1.hcl
@@ -0,0 +1,21 @@
+# Increase log verbosity
+log_level = "DEBUG"
+
+# Setup data dir
+data_dir = "/tmp/client1"
+
+# Give the agent a unique name. Defaults to hostname
+name = "client1"
+
+# Enable the client
+client {
+  enabled = true
+
+  server_join {
+    retry_join = ["127.0.0.1:4647", "127.0.0.1:5647", "127.0.0.1:6647"]
+  }
+}
+
+ports {
+  http = 7646
+}
diff --git a/dev/cluster/client2.hcl b/dev/cluster/client2.hcl
new file mode 100644
index 000000000..f6249fbb9
--- /dev/null
+++ b/dev/cluster/client2.hcl
@@ -0,0 +1,21 @@
+# Increase log verbosity
+log_level = "DEBUG"
+
+# Setup data dir
+data_dir = "/tmp/client2"
+
+# Give the agent a unique name. Defaults to hostname
+name = "client2"
+
+# Enable the client
+client {
+  enabled = true
+
+  server_join {
+    retry_join = ["127.0.0.1:4647", "127.0.0.1:5647", "127.0.0.1:6647"]
+  }
+}
+
+ports {
+  http = 8646
+}
diff --git a/dev/cluster/server1.hcl b/dev/cluster/server1.hcl
index e5c05c0b3..62b2c792a 100644
--- a/dev/cluster/server1.hcl
+++ b/dev/cluster/server1.hcl
@@ -11,7 +11,9 @@ name = "server1"
 server {
   enabled = true
 
-  retry_join = ["127.0.0.1:5648", "127.0.0.1:6648"]
+  server_join {
+    retry_join = ["127.0.0.1:5648", "127.0.0.1:6648"]
+  }
 
   # Self-elect, should be 3 or 5 for production
   bootstrap_expect = 3
diff --git a/dev/cluster/server2.hcl b/dev/cluster/server2.hcl
index 71d897f2f..c50fbf8b6 100644
--- a/dev/cluster/server2.hcl
+++ b/dev/cluster/server2.hcl
@@ -11,7 +11,9 @@ name = "server2"
 server {
   enabled = true
 
-  retry_join = ["127.0.0.1:4648", "127.0.0.1:6648"]
+  server_join {
+    retry_join = ["127.0.0.1:4648", "127.0.0.1:6648"]
+  }
 
   # Self-elect, should be 3 or 5 for production
   bootstrap_expect = 3
diff --git a/dev/cluster/server3.hcl b/dev/cluster/server3.hcl
index 21774ae3e..2c276dde0 100644
--- a/dev/cluster/server3.hcl
+++ b/dev/cluster/server3.hcl
@@ -10,7 +10,9 @@ name = "server3"
 server {
   enabled = true
 
-  retry_join = ["127.0.0.1:4648", "127.0.0.1:5648"]
+  server_join {
+    retry_join = ["127.0.0.1:4648", "127.0.0.1:5648"]
+  }
 
   # Self-elect, should be 3 or 5 for production
   bootstrap_expect = 3