diff --git a/gokrazy/tsapp/config.json b/gokrazy/tsapp/config.json
index 10825b3c5..fbf87f0b1 100644
--- a/gokrazy/tsapp/config.json
+++ b/gokrazy/tsapp/config.json
@@ -11,16 +11,20 @@
     ],
     "Packages": [
         "github.com/gokrazy/serial-busybox",
-        "github.com/gokrazy/breakglass",
+        "github.com/tailscale/breakglass",
         "github.com/bradfitz/qemu-guest-kragent",
         "tailscale.com/cmd/fbstatus",
         "tailscale.com/cmd/tailscale",
         "tailscale.com/cmd/tailscaled"
     ],
     "PackageConfig": {
-        "github.com/gokrazy/breakglass": {
+        "github.com/tailscale/breakglass": {
             "CommandLineFlags": [
-                "-authorized_keys=/perm/breakglass.authorized_keys"
+                "-authorized_keys=ec2",
+                "-allowed_user=aws-marketplace-sec-scan",
+                "-allowed_cidrs=10.0.0.0/16,10.2.0.0/16",
+                "-stop_after_idle=120s",
+                "-start_on_boot=true"
             ]
         },
         "tailscale.com/cmd/tailscale": {
diff --git a/gokrazy/tsapp/gokrazydeps.go b/gokrazy/tsapp/gokrazydeps.go
index 60935b24f..477d5da0d 100644
--- a/gokrazy/tsapp/gokrazydeps.go
+++ b/gokrazy/tsapp/gokrazydeps.go
@@ -7,12 +7,12 @@
 
 import (
 	_ "github.com/bradfitz/qemu-guest-kragent"
-	_ "github.com/gokrazy/breakglass"
 	_ "github.com/gokrazy/gokrazy/cmd/dhcp"
 	_ "github.com/gokrazy/gokrazy/cmd/ntp"
 	_ "github.com/gokrazy/gokrazy/cmd/randomd"
 	_ "github.com/gokrazy/kernel.amd64"
 	_ "github.com/gokrazy/serial-busybox"
+	_ "github.com/tailscale/breakglass"
 	_ "github.com/tailscale/ts-gokrazy/gokrazyinit"
 	_ "tailscale.com/cmd/tailscale"
 	_ "tailscale.com/cmd/tailscaled"