diff --git a/docker-compose.yml b/docker-compose.yml
index 86520e23c1..016d4c1083 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,15 @@
 version: '3'
 services:
+
   server:
-    image: rancher/k3s:v1.0.0
-    command: server --disable-agent
+    image: "rancher/k3s:${K3S_VERSION:-latest}"
+    command: server
+    tmpfs:
+    - /run
+    - /var/run
+    privileged: true
     environment:
-    - K3S_CLUSTER_SECRET=somethingtotallyrandom
+    - K3S_TOKEN=${K3S_TOKEN:-somethingtotallyrandom}
     - K3S_KUBECONFIG_OUTPUT=/output/kubeconfig.yaml
     - K3S_KUBECONFIG_MODE=666
     volumes:
@@ -14,17 +19,15 @@ services:
     ports:
     - 6443:6443
 
-  node:
-    image: rancher/k3s:v1.0.0
+  agent:
+    image: "rancher/k3s:${K3S_VERSION:-latest}"
     tmpfs:
     - /run
     - /var/run
     privileged: true
     environment:
     - K3S_URL=https://server:6443
-    - K3S_CLUSTER_SECRET=somethingtotallyrandom
-    # Can also use K3S_TOKEN from /var/lib/rancher/k3s/server/node-token instead of K3S_CLUSTER_SECRET
-    #- K3S_TOKEN=K13849a67fc385fd3c0fa6133a8649d9e717b0258b3b09c87ffc33dae362c12d8c0::node:2e373dca319a0525745fd8b3d8120d9c
+    - K3S_TOKEN=${K3S_TOKEN:-somethingtotallyrandom}
 
 volumes:
   k3s-server: {}