diff --git a/base/main.tf b/base/main.tf
index 45315e5..d29b0be 100644
--- a/base/main.tf
+++ b/base/main.tf
@@ -63,8 +63,6 @@ resource "coder_agent" "main" {
 
     # Language-specific startup commands
     ${var.language_startup_script}
-
-    sudo dockerd &
   EOT
 
   env = {
@@ -127,6 +125,16 @@ resource "coder_agent" "main" {
   }
 }
 
+resource "coder_script" "dockerd" {
+  agent_id     = coder_agent.main.id
+  display_name = "Docker Daemon"
+  icon         = "${data.coder_workspace.me.access_url}/icon/docker.png"
+  run_on_start = true
+  script       = <<EOF
+    sudo dockerd
+  EOF
+}
+
 module "code-server" {
   count  = data.coder_workspace.me.start_count
   source = "registry.coder.com/modules/code-server/coder"