From c22917fbdc64f6dd50658b28f25a5c782d761f2a Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 17:37:28 +0000
Subject: [PATCH 01/12] chore(examples): Update all coder providers to v0.6.9

---
 examples/templates/aws-ecs-container/main.tf    | 2 +-
 examples/templates/aws-linux/main.tf            | 2 +-
 examples/templates/aws-windows/main.tf          | 2 +-
 examples/templates/azure-linux/main.tf          | 2 +-
 examples/templates/do-linux/main.tf             | 2 +-
 examples/templates/docker-code-server/main.tf   | 2 +-
 examples/templates/docker-image-builds/main.tf  | 2 +-
 examples/templates/docker-with-dotfiles/main.tf | 2 +-
 examples/templates/docker/main.tf               | 2 +-
 examples/templates/gcp-linux/main.tf            | 2 +-
 examples/templates/gcp-vm-container/main.tf     | 2 +-
 examples/templates/gcp-windows/main.tf          | 2 +-
 examples/templates/kubernetes/main.tf           | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
index 2f07f965e5e4b..b3c8581ecb48f 100644
--- a/examples/templates/aws-ecs-container/main.tf
+++ b/examples/templates/aws-ecs-container/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
   }
 }
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index c4d70d3b6b09f..36b6d37779c53 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
   }
 }
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
index 062b07d82232a..c04613a01cf84 100644
--- a/examples/templates/aws-windows/main.tf
+++ b/examples/templates/aws-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
   }
 }
diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf
index e388ff1783e78..f5171b203dc0d 100644
--- a/examples/templates/azure-linux/main.tf
+++ b/examples/templates/azure-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
index cc345411beda8..93d1b84288e8c 100644
--- a/examples/templates/do-linux/main.tf
+++ b/examples/templates/do-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     digitalocean = {
       source  = "digitalocean/digitalocean"
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
index 57f4b0f0235ba..105ea2d330efd 100644
--- a/examples/templates/docker-code-server/main.tf
+++ b/examples/templates/docker-code-server/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
index 22eddf9007b8c..8a292647eb87b 100644
--- a/examples/templates/docker-image-builds/main.tf
+++ b/examples/templates/docker-image-builds/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
index 795bcaf90be65..362aa6fc1df61 100644
--- a/examples/templates/docker-with-dotfiles/main.tf
+++ b/examples/templates/docker-with-dotfiles/main.tf
@@ -9,7 +9,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
index 7e29d565c5392..207570500964a 100644
--- a/examples/templates/docker/main.tf
+++ b/examples/templates/docker/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
index fe9cd0017442f..a0ab4d7f415ff 100644
--- a/examples/templates/gcp-linux/main.tf
+++ b/examples/templates/gcp-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
index c8a4167c5a8f8..3d86b0e1c6193 100644
--- a/examples/templates/gcp-vm-container/main.tf
+++ b/examples/templates/gcp-vm-container/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
index 25d58fc92068a..8af2403026bdf 100644
--- a/examples/templates/gcp-windows/main.tf
+++ b/examples/templates/gcp-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
index 7c17c1a1ceaa6..b08372e739528 100644
--- a/examples/templates/kubernetes/main.tf
+++ b/examples/templates/kubernetes/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.6"
+      version = "0.6.9"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

From 260ae3aaf8ac90ebda4d598d067e5ddb421c52c3 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 18:00:11 +0000
Subject: [PATCH 02/12] chore(examples): Add `delay_login_until_ready` and
 `startup_script_timeout`

---
 examples/templates/aws-ecs-container/main.tf  | 20 +++++++++++--------
 examples/templates/aws-linux/main.tf          | 17 +++++++++-------
 examples/templates/aws-windows/main.tf        |  2 ++
 examples/templates/azure-linux/main.tf        |  2 ++
 examples/templates/do-linux/main.tf           |  2 ++
 examples/templates/docker-code-server/main.tf | 12 ++++++++---
 .../templates/docker-image-builds/main.tf     | 15 ++++++++------
 .../templates/docker-with-dotfiles/main.tf    | 16 ++++++++++++---
 examples/templates/docker/main.tf             | 16 +++++++++------
 examples/templates/gcp-linux/main.tf          | 17 +++++++++-------
 examples/templates/gcp-vm-container/main.tf   | 17 +++++++++-------
 examples/templates/gcp-windows/main.tf        |  2 ++
 12 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
index b3c8581ecb48f..26af60abdd1c0 100644
--- a/examples/templates/aws-ecs-container/main.tf
+++ b/examples/templates/aws-ecs-container/main.tf
@@ -92,15 +92,19 @@ resource "aws_ecs_service" "workspace" {
 data "coder_workspace" "me" {}
 
 resource "coder_agent" "coder" {
-  arch           = "amd64"
-  auth           = "token"
-  os             = "linux"
-  dir            = "/home/coder"
-  startup_script = <<EOT
-    #!/bin/bash
+  arch = "amd64"
+  auth = "token"
+  os   = "linux"
+  dir  = "/home/coder"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
+
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
+    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
   EOT
 }
 
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index 36b6d37779c53..4b0853b832457 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -73,15 +73,18 @@ data "aws_ami" "ubuntu" {
 }
 
 resource "coder_agent" "main" {
-  arch           = "amd64"
-  auth           = "aws-instance-identity"
-  os             = "linux"
-  startup_script = <<EOT
-    #!/bin/bash
+  arch = "amd64"
+  auth = "aws-instance-identity"
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
 
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
+    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
   EOT
 }
 
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
index c04613a01cf84..80ce9c7668a63 100644
--- a/examples/templates/aws-windows/main.tf
+++ b/examples/templates/aws-windows/main.tf
@@ -73,6 +73,8 @@ resource "coder_agent" "main" {
   arch = "amd64"
   auth = "aws-instance-identity"
   os   = "windows"
+
+  delay_login_until_ready = true
 }
 
 locals {
diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf
index f5171b203dc0d..76071e3292e6c 100644
--- a/examples/templates/azure-linux/main.tf
+++ b/examples/templates/azure-linux/main.tf
@@ -83,6 +83,8 @@ resource "coder_agent" "main" {
   arch = "amd64"
   os   = "linux"
   auth = "azure-instance-identity"
+
+  delay_login_until_ready = true
 }
 
 locals {
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
index 93d1b84288e8c..4b09f29c7a618 100644
--- a/examples/templates/do-linux/main.tf
+++ b/examples/templates/do-linux/main.tf
@@ -96,6 +96,8 @@ data "coder_workspace" "me" {}
 resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
+
+  delay_login_until_ready = true
 }
 
 resource "digitalocean_volume" "home_volume" {
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
index 105ea2d330efd..0945b22357df7 100644
--- a/examples/templates/docker-code-server/main.tf
+++ b/examples/templates/docker-code-server/main.tf
@@ -21,9 +21,15 @@ data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "main" {
-  arch           = data.coder_provisioner.me.arch
-  os             = "linux"
-  startup_script = "code-server --auth none"
+  arch = data.coder_provisioner.me.arch
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
+    code-server --auth none >/tmp/code-server.log 2>&1 &
+  EOT
 
   # These environment variables allow you to make Git commits right away after creating a
   # workspace. Note that they take precedence over configuration defined in ~/.gitconfig!
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
index 8a292647eb87b..ff9c22de47ec6 100644
--- a/examples/templates/docker-image-builds/main.tf
+++ b/examples/templates/docker-image-builds/main.tf
@@ -22,14 +22,17 @@ data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "main" {
-  arch           = data.coder_provisioner.me.arch
-  os             = "linux"
-  startup_script = <<EOT
-    #!/bin/bash
+  arch = data.coder_provisioner.me.arch
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
 
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
+    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
   EOT
 }
 
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
index 362aa6fc1df61..4b17aab744bb0 100644
--- a/examples/templates/docker-with-dotfiles/main.tf
+++ b/examples/templates/docker-with-dotfiles/main.tf
@@ -41,9 +41,19 @@ variable "dotfiles_uri" {
 }
 
 resource "coder_agent" "main" {
-  arch           = data.coder_provisioner.me.arch
-  os             = "linux"
-  startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null
+  arch = data.coder_provisioner.me.arch
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  env                     = { "DOTFILES_URI" = var.dotfiles_uri != "" ? var.dotfiles_uri : null }
+  startup_script          = <<EOT
+    set -e
+    if [ -n "$DOTFILES_URI" ]; then
+      echo "Installing dotfiles from $DOTFILES_URI"
+      coder dotfiles -y "$DOTFILES_URI"
+    fi
+  EOT
 }
 
 resource "docker_volume" "home_volume" {
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
index 207570500964a..bb29f8eedfb6a 100644
--- a/examples/templates/docker/main.tf
+++ b/examples/templates/docker/main.tf
@@ -25,14 +25,18 @@ data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "main" {
-  arch           = data.coder_provisioner.me.arch
-  os             = "linux"
-  startup_script = <<EOF
-    #!/bin/sh
+  arch = data.coder_provisioner.me.arch
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
+
     # install and start code-server
     curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
-    code-server --auth none --port 13337
-    EOF
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
+  EOT
 
   # These environment variables allow you to make Git commits right away after creating a
   # workspace. Note that they take precedence over configuration defined in ~/.gitconfig!
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
index a0ab4d7f415ff..fcc00aa00f6c8 100644
--- a/examples/templates/gcp-linux/main.tf
+++ b/examples/templates/gcp-linux/main.tf
@@ -46,15 +46,18 @@ resource "google_compute_disk" "root" {
 }
 
 resource "coder_agent" "main" {
-  auth           = "google-instance-identity"
-  arch           = "amd64"
-  os             = "linux"
-  startup_script = <<EOT
-    #!/bin/bash
+  auth = "google-instance-identity"
+  arch = "amd64"
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
 
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
+    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
   EOT
 }
 
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
index 3d86b0e1c6193..9f62a3f578a99 100644
--- a/examples/templates/gcp-vm-container/main.tf
+++ b/examples/templates/gcp-vm-container/main.tf
@@ -36,15 +36,18 @@ data "coder_workspace" "me" {
 }
 
 resource "coder_agent" "main" {
-  auth           = "google-instance-identity"
-  arch           = "amd64"
-  os             = "linux"
-  startup_script = <<EOT
-    #!/bin/bash
+  auth = "google-instance-identity"
+  arch = "amd64"
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<EOT
+    set -e
 
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
+    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
   EOT
 }
 
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
index 8af2403026bdf..97d6547483933 100644
--- a/examples/templates/gcp-windows/main.tf
+++ b/examples/templates/gcp-windows/main.tf
@@ -49,6 +49,8 @@ resource "coder_agent" "main" {
   auth = "google-instance-identity"
   arch = "amd64"
   os   = "windows"
+
+  delay_login_until_ready = true
 }
 
 resource "google_compute_instance" "dev" {

From 22caabbc359f996b5bfcd9e3133dfcf4ea965d5c Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 20:00:56 +0000
Subject: [PATCH 03/12] Use <<-EOT (vs <<EOT) to eliminate whitespace in front

---
 examples/templates/aws-ecs-container/main.tf    | 2 +-
 examples/templates/aws-linux/main.tf            | 6 +++---
 examples/templates/aws-windows/main.tf          | 4 ++--
 examples/templates/docker-code-server/main.tf   | 2 +-
 examples/templates/docker-image-builds/main.tf  | 2 +-
 examples/templates/docker-with-dotfiles/main.tf | 2 +-
 examples/templates/docker/main.tf               | 2 +-
 examples/templates/gcp-linux/main.tf            | 2 +-
 examples/templates/gcp-vm-container/main.tf     | 2 +-
 examples/templates/kubernetes/main.tf           | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
index 26af60abdd1c0..9a14e69a6e8e9 100644
--- a/examples/templates/aws-ecs-container/main.tf
+++ b/examples/templates/aws-ecs-container/main.tf
@@ -99,7 +99,7 @@ resource "coder_agent" "coder" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index 4b0853b832457..b63991f946cc8 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -79,7 +79,7 @@ resource "coder_agent" "main" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
 
     # install and start code-server
@@ -109,7 +109,7 @@ locals {
   # User data is used to stop/start AWS instances. See:
   # https://github.com/hashicorp/terraform-provider-aws/issues/22
 
-  user_data_start = <<EOT
+  user_data_start = <<-EOT
 Content-Type: multipart/mixed; boundary="//"
 MIME-Version: 1.0
 
@@ -139,7 +139,7 @@ sudo -u ${local.linux_user} sh -c '${coder_agent.main.init_script}'
 --//--
 EOT
 
-  user_data_end = <<EOT
+  user_data_end = <<-EOT
 Content-Type: multipart/mixed; boundary="//"
 MIME-Version: 1.0
 
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
index 80ce9c7668a63..ef4be96894922 100644
--- a/examples/templates/aws-windows/main.tf
+++ b/examples/templates/aws-windows/main.tf
@@ -82,7 +82,7 @@ locals {
   # User data is used to stop/start AWS instances. See:
   # https://github.com/hashicorp/terraform-provider-aws/issues/22
 
-  user_data_start = <<EOT
+  user_data_start = <<-EOT
 <powershell>
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 ${coder_agent.main.init_script}
@@ -90,7 +90,7 @@ ${coder_agent.main.init_script}
 <persist>true</persist>
 EOT
 
-  user_data_end = <<EOT
+  user_data_end = <<-EOT
 <powershell>
 shutdown /s
 </powershell>
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
index 0945b22357df7..60adab7fea796 100644
--- a/examples/templates/docker-code-server/main.tf
+++ b/examples/templates/docker-code-server/main.tf
@@ -26,7 +26,7 @@ resource "coder_agent" "main" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
     code-server --auth none >/tmp/code-server.log 2>&1 &
   EOT
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
index ff9c22de47ec6..48afa8acce603 100644
--- a/examples/templates/docker-image-builds/main.tf
+++ b/examples/templates/docker-image-builds/main.tf
@@ -27,7 +27,7 @@ resource "coder_agent" "main" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
index 4b17aab744bb0..7bb58d5abc9e8 100644
--- a/examples/templates/docker-with-dotfiles/main.tf
+++ b/examples/templates/docker-with-dotfiles/main.tf
@@ -47,7 +47,7 @@ resource "coder_agent" "main" {
   delay_login_until_ready = true
   startup_script_timeout  = 180
   env                     = { "DOTFILES_URI" = var.dotfiles_uri != "" ? var.dotfiles_uri : null }
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
     if [ -n "$DOTFILES_URI" ]; then
       echo "Installing dotfiles from $DOTFILES_URI"
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
index bb29f8eedfb6a..9a27760300f64 100644
--- a/examples/templates/docker/main.tf
+++ b/examples/templates/docker/main.tf
@@ -30,7 +30,7 @@ resource "coder_agent" "main" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
index fcc00aa00f6c8..cfe9573222119 100644
--- a/examples/templates/gcp-linux/main.tf
+++ b/examples/templates/gcp-linux/main.tf
@@ -52,7 +52,7 @@ resource "coder_agent" "main" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
index 9f62a3f578a99..0aa24f1f3f773 100644
--- a/examples/templates/gcp-vm-container/main.tf
+++ b/examples/templates/gcp-vm-container/main.tf
@@ -42,7 +42,7 @@ resource "coder_agent" "main" {
 
   delay_login_until_ready = true
   startup_script_timeout  = 180
-  startup_script          = <<EOT
+  startup_script          = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
index b08372e739528..e18ae56f991a2 100644
--- a/examples/templates/kubernetes/main.tf
+++ b/examples/templates/kubernetes/main.tf
@@ -51,7 +51,7 @@ data "coder_workspace" "me" {}
 resource "coder_agent" "main" {
   os             = "linux"
   arch           = "amd64"
-  startup_script = <<EOT
+  startup_script = <<-EOT
     #!/bin/bash
 
     # home folder can be empty, so copying default bash settings

From c8ff74dacf26f8bb9bfd526ba3f3f1bd34170dbc Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 20:01:21 +0000
Subject: [PATCH 04/12] Improve first user experience with docker by setting
 /bin/bash as shell

---
 examples/templates/docker/build/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/templates/docker/build/Dockerfile b/examples/templates/docker/build/Dockerfile
index 29d3bf7cf0236..a443b5d07100e 100644
--- a/examples/templates/docker/build/Dockerfile
+++ b/examples/templates/docker/build/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 
 ARG USER=coder
-RUN useradd --groups sudo --no-create-home ${USER} \
+RUN useradd --groups sudo --no-create-home --shell /bin/bash ${USER} \
 	&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
 	&& chmod 0440 /etc/sudoers.d/${USER}
 USER ${USER}

From f143255c45cc559c05508b3ca244d6727ea19a3e Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 20:01:55 +0000
Subject: [PATCH 05/12] Update dogfood template

---
 dogfood/main.tf | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index e98d4225545a9..ce3cfc9b56829 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.0"
+      version = "0.6.9"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -58,9 +58,12 @@ provider "coder" {}
 data "coder_workspace" "me" {}
 
 resource "coder_agent" "dev" {
-  arch           = "amd64"
-  os             = "linux"
-  startup_script = <<EOF
+  arch = "amd64"
+  os   = "linux"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 60
+  startup_script          = <<-EOT
     #!/bin/sh
     set -x
     # install and start code-server
@@ -77,7 +80,7 @@ resource "coder_agent" "dev" {
     elif [ -f ~/personalize ]; then
       echo "~/personalize is not executable, skipping..." | tee -a ~/.personalize.log
     fi
-    EOF
+  EOT
 }
 
 resource "coder_app" "code-server" {

From 548a94113d31bc2b7d5902297e6bef921d9090b5 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 20:04:24 +0000
Subject: [PATCH 06/12] Missed a few instances of shebang

---
 examples/templates/kubernetes/README.md | 4 +---
 examples/templates/kubernetes/main.tf   | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/templates/kubernetes/README.md b/examples/templates/kubernetes/README.md
index f0725a58ff377..ea7632cac15fa 100644
--- a/examples/templates/kubernetes/README.md
+++ b/examples/templates/kubernetes/README.md
@@ -96,9 +96,7 @@ block of your workspace template:
 
 ```terraform
 resource "coder_agent" "main" {
-  startup_script = <<EOT
-    #!/bin/bash
-
+  startup_script = <<-EOT
     # install AWS CLI
     curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
     unzip awscliv2.zip
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
index e18ae56f991a2..55058f44b6f26 100644
--- a/examples/templates/kubernetes/main.tf
+++ b/examples/templates/kubernetes/main.tf
@@ -52,8 +52,6 @@ resource "coder_agent" "main" {
   os             = "linux"
   arch           = "amd64"
   startup_script = <<-EOT
-    #!/bin/bash
-
     # home folder can be empty, so copying default bash settings
     if [ ! -f ~/.profile ]; then
       cp /etc/skel/.profile $HOME

From d9e067e8aefc267daa4e88cb6329dead40620bd6 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 26 Jan 2023 20:18:09 +0000
Subject: [PATCH 07/12] Fix a few more misses

---
 examples/templates/kubernetes/README.md |  1 +
 examples/templates/kubernetes/main.tf   | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/examples/templates/kubernetes/README.md b/examples/templates/kubernetes/README.md
index ea7632cac15fa..edb0b268831a7 100644
--- a/examples/templates/kubernetes/README.md
+++ b/examples/templates/kubernetes/README.md
@@ -97,6 +97,7 @@ block of your workspace template:
 ```terraform
 resource "coder_agent" "main" {
   startup_script = <<-EOT
+    set -e
     # install AWS CLI
     curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
     unzip awscliv2.zip
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
index 55058f44b6f26..1e84773a39deb 100644
--- a/examples/templates/kubernetes/main.tf
+++ b/examples/templates/kubernetes/main.tf
@@ -49,9 +49,14 @@ provider "kubernetes" {
 data "coder_workspace" "me" {}
 
 resource "coder_agent" "main" {
-  os             = "linux"
-  arch           = "amd64"
-  startup_script = <<-EOT
+  os   = "linux"
+  arch = "amd64"
+
+  delay_login_until_ready = true
+  startup_script_timeout  = 180
+  startup_script          = <<-EOT
+    set -e
+
     # home folder can be empty, so copying default bash settings
     if [ ! -f ~/.profile ]; then
       cp /etc/skel/.profile $HOME
@@ -61,8 +66,8 @@ resource "coder_agent" "main" {
     fi
 
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
+    curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
+    code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
   EOT
 }
 

From 3bceccca5a1fe2c6d9cb8ed29cd54be73302f034 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 27 Jan 2023 11:37:56 +0000
Subject: [PATCH 08/12] Revert unintended change

---
 examples/templates/aws-linux/main.tf   | 4 ++--
 examples/templates/aws-windows/main.tf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index b63991f946cc8..0a6092a0ac39c 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -109,7 +109,7 @@ locals {
   # User data is used to stop/start AWS instances. See:
   # https://github.com/hashicorp/terraform-provider-aws/issues/22
 
-  user_data_start = <<-EOT
+  user_data_start = <<EOT
 Content-Type: multipart/mixed; boundary="//"
 MIME-Version: 1.0
 
@@ -139,7 +139,7 @@ sudo -u ${local.linux_user} sh -c '${coder_agent.main.init_script}'
 --//--
 EOT
 
-  user_data_end = <<-EOT
+  user_data_end = <<EOT
 Content-Type: multipart/mixed; boundary="//"
 MIME-Version: 1.0
 
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
index ef4be96894922..80ce9c7668a63 100644
--- a/examples/templates/aws-windows/main.tf
+++ b/examples/templates/aws-windows/main.tf
@@ -82,7 +82,7 @@ locals {
   # User data is used to stop/start AWS instances. See:
   # https://github.com/hashicorp/terraform-provider-aws/issues/22
 
-  user_data_start = <<-EOT
+  user_data_start = <<EOT
 <powershell>
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 ${coder_agent.main.init_script}
@@ -90,7 +90,7 @@ ${coder_agent.main.init_script}
 <persist>true</persist>
 EOT
 
-  user_data_end = <<-EOT
+  user_data_end = <<EOT
 <powershell>
 shutdown /s
 </powershell>

From 921e67907fd23c0ec0383a4084da77f6fb2500dd Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 27 Jan 2023 11:38:59 +0000
Subject: [PATCH 09/12] Remove one more shebang

---
 dogfood/main.tf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index ce3cfc9b56829..7d947c7444eea 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -64,8 +64,7 @@ resource "coder_agent" "dev" {
   delay_login_until_ready = true
   startup_script_timeout  = 60
   startup_script          = <<-EOT
-    #!/bin/sh
-    set -x
+    set -ex
     # install and start code-server
     curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
     code-server --auth none --port 13337 &

From f17f45f322e165494f54c40747785ac81de602ff Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 27 Jan 2023 11:40:24 +0000
Subject: [PATCH 10/12] Redirect personalize stderr in dogfood startup script

---
 dogfood/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 7d947c7444eea..377aab78055be 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -75,7 +75,7 @@ resource "coder_agent" "dev" {
       coder dotfiles "$DOTFILES_URI" -y 2>&1 | tee -a ~/.personalize.log
     fi
     if [ -x ~/personalize ]; then
-      ~/personalize | tee -a ~/.personalize.log
+      ~/personalize 2>&1 | tee -a ~/.personalize.log
     elif [ -f ~/personalize ]; then
       echo "~/personalize is not executable, skipping..." | tee -a ~/.personalize.log
     fi

From 8bcfd1c183e13479fb83fe03430dd3a516eacd31 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 27 Jan 2023 20:12:20 +0000
Subject: [PATCH 11/12] Change `delay_login_until_ready` to
 `login_before_ready`

---
 dogfood/main.tf                                 |  6 +++---
 examples/templates/aws-ecs-container/main.tf    |  8 ++++----
 examples/templates/aws-linux/main.tf            |  8 ++++----
 examples/templates/aws-windows/main.tf          |  4 ++--
 examples/templates/azure-linux/main.tf          |  4 ++--
 examples/templates/do-linux/main.tf             |  4 ++--
 examples/templates/docker-code-server/main.tf   |  8 ++++----
 examples/templates/docker-image-builds/main.tf  |  8 ++++----
 examples/templates/docker-with-dotfiles/main.tf | 10 +++++-----
 examples/templates/docker/main.tf               |  8 ++++----
 examples/templates/gcp-linux/main.tf            |  8 ++++----
 examples/templates/gcp-vm-container/main.tf     |  8 ++++----
 examples/templates/gcp-windows/main.tf          |  4 ++--
 examples/templates/kubernetes/main.tf           |  8 ++++----
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 377aab78055be..0de7db2ea6120 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -61,9 +61,9 @@ resource "coder_agent" "dev" {
   arch = "amd64"
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 60
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 60
+  startup_script         = <<-EOT
     set -ex
     # install and start code-server
     curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3
diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
index 9a14e69a6e8e9..2ae6b833d42a4 100644
--- a/examples/templates/aws-ecs-container/main.tf
+++ b/examples/templates/aws-ecs-container/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
   }
 }
@@ -97,9 +97,9 @@ resource "coder_agent" "coder" {
   os   = "linux"
   dir  = "/home/coder"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
index 0a6092a0ac39c..4a70707f6c962 100644
--- a/examples/templates/aws-linux/main.tf
+++ b/examples/templates/aws-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
   }
 }
@@ -77,9 +77,9 @@ resource "coder_agent" "main" {
   auth = "aws-instance-identity"
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
index 80ce9c7668a63..035a915f57881 100644
--- a/examples/templates/aws-windows/main.tf
+++ b/examples/templates/aws-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
   }
 }
@@ -74,7 +74,7 @@ resource "coder_agent" "main" {
   auth = "aws-instance-identity"
   os   = "windows"
 
-  delay_login_until_ready = true
+  login_before_ready = false
 }
 
 locals {
diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf
index 76071e3292e6c..e0237254bde71 100644
--- a/examples/templates/azure-linux/main.tf
+++ b/examples/templates/azure-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
@@ -84,7 +84,7 @@ resource "coder_agent" "main" {
   os   = "linux"
   auth = "azure-instance-identity"
 
-  delay_login_until_ready = true
+  login_before_ready = false
 }
 
 locals {
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
index 4b09f29c7a618..f8742bfb723e0 100644
--- a/examples/templates/do-linux/main.tf
+++ b/examples/templates/do-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     digitalocean = {
       source  = "digitalocean/digitalocean"
@@ -97,7 +97,7 @@ resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
 
-  delay_login_until_ready = true
+  login_before_ready = false
 }
 
 resource "digitalocean_volume" "home_volume" {
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
index 60adab7fea796..706de7da1cfa1 100644
--- a/examples/templates/docker-code-server/main.tf
+++ b/examples/templates/docker-code-server/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -24,9 +24,9 @@ resource "coder_agent" "main" {
   arch = data.coder_provisioner.me.arch
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
     code-server --auth none >/tmp/code-server.log 2>&1 &
   EOT
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
index 48afa8acce603..6668867053017 100644
--- a/examples/templates/docker-image-builds/main.tf
+++ b/examples/templates/docker-image-builds/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -25,9 +25,9 @@ resource "coder_agent" "main" {
   arch = data.coder_provisioner.me.arch
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
index 7bb58d5abc9e8..6b2c956d0e3a1 100644
--- a/examples/templates/docker-with-dotfiles/main.tf
+++ b/examples/templates/docker-with-dotfiles/main.tf
@@ -9,7 +9,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -44,10 +44,10 @@ resource "coder_agent" "main" {
   arch = data.coder_provisioner.me.arch
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  env                     = { "DOTFILES_URI" = var.dotfiles_uri != "" ? var.dotfiles_uri : null }
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  env                    = { "DOTFILES_URI" = var.dotfiles_uri != "" ? var.dotfiles_uri : null }
+  startup_script         = <<-EOT
     set -e
     if [ -n "$DOTFILES_URI" ]; then
       echo "Installing dotfiles from $DOTFILES_URI"
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
index 9a27760300f64..89bf7215e22d8 100644
--- a/examples/templates/docker/main.tf
+++ b/examples/templates/docker/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     docker = {
       source  = "kreuzwerker/docker"
@@ -28,9 +28,9 @@ resource "coder_agent" "main" {
   arch = data.coder_provisioner.me.arch
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
index cfe9573222119..26ed3ab365a72 100644
--- a/examples/templates/gcp-linux/main.tf
+++ b/examples/templates/gcp-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     google = {
       source  = "hashicorp/google"
@@ -50,9 +50,9 @@ resource "coder_agent" "main" {
   arch = "amd64"
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
index 0aa24f1f3f773..92b51621956b0 100644
--- a/examples/templates/gcp-vm-container/main.tf
+++ b/examples/templates/gcp-vm-container/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     google = {
       source  = "hashicorp/google"
@@ -40,9 +40,9 @@ resource "coder_agent" "main" {
   arch = "amd64"
   os   = "linux"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # install and start code-server
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
index 97d6547483933..bdc1b0b60cd50 100644
--- a/examples/templates/gcp-windows/main.tf
+++ b/examples/templates/gcp-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     google = {
       source  = "hashicorp/google"
@@ -50,7 +50,7 @@ resource "coder_agent" "main" {
   arch = "amd64"
   os   = "windows"
 
-  delay_login_until_ready = true
+  login_before_ready = false
 }
 
 resource "google_compute_instance" "dev" {
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
index 1e84773a39deb..9255f8a128273 100644
--- a/examples/templates/kubernetes/main.tf
+++ b/examples/templates/kubernetes/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
@@ -52,9 +52,9 @@ resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
 
-  delay_login_until_ready = true
-  startup_script_timeout  = 180
-  startup_script          = <<-EOT
+  login_before_ready     = false
+  startup_script_timeout = 180
+  startup_script         = <<-EOT
     set -e
 
     # home folder can be empty, so copying default bash settings

From 8bbc0f8db63745a5af4bd6c4c126c39e580930c7 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 27 Jan 2023 20:14:38 +0000
Subject: [PATCH 12/12] fixup! Change `delay_login_until_ready` to
 `login_before_ready`

---
 dogfood/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 0de7db2ea6120..46862d47ebfdb 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
     docker = {
       source  = "kreuzwerker/docker"