diff --git a/config/projects.toml b/config/projects.toml
index 25d854e..e3b0219 100644
--- a/config/projects.toml
+++ b/config/projects.toml
@@ -60,7 +60,7 @@ cargo_build = false
 auto_update = true
 
 [project.pilot]
-github = "oxidecomputer/compliance-pilot"
+github = "oxidecomputer/pilot"
 use_ssh = true
 cargo_build = true
 auto_update = true
diff --git a/image/templates/gimlet/zfs-compliance.json b/image/templates/gimlet/zfs-compliance.json
deleted file mode 100644
index f3b47a1..0000000
--- a/image/templates/gimlet/zfs-compliance.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "pool": {
-        "name": "rpool",
-        "bename": "ramdisk",
-        "ashift": 9,
-        "uefi": false,
-        "size": 650,
-        "label": false,
-        "no_features": false,
-        "compression": "gzip-9",
-        "autoexpand": true,
-        "options": [ "failmode=panic" ],
-        "fsoptions": [ "primarycache=none" ]
-    },
-
-    "steps": [
-        { "t": "create_be" },
-
-        { "t": "unpack_tar", "name": "gimlet-ramdisk.tar" },
-
-        { "t": "include", "name": "devfs" },
-
-        { "t": "include", "name": "common" },
-
-        { "t": "ensure_file", "file": "/etc/auto_master",
-            "src": "auto_master",
-            "owner": "root", "group": "root", "mode": "644" },
-
-        { "t": "ensure_file", "file": "/etc/ttydefs",
-            "src": "ttydefs.${baud}",
-            "owner": "root", "group": "sys", "mode": "644" },
-
-        { "t": "ensure_file", "file": "/etc/default/init",
-            "src": "default_init",
-            "owner": "root", "group": "root", "mode": "644" },
-
-        { "t": "ensure_file", "file": "/etc/inet/chrony.conf",
-            "src": "chrony.conf",
-            "owner": "root", "group": "root", "mode": "644" },
-
-        { "t": "ensure_file", "file": "/etc/ssh/sshd_config",
-            "src": "sshd_config",
-            "owner": "root", "group": "root", "mode": "644" },
-
-        { "t": "ensure_file", "file": "/usr/lib/bootparams",
-            "src": "bootparams.sh",
-            "owner": "root", "group": "bin", "mode": "0755" },
-
-        { "t": "include", "name": "t6-firmware" },
-
-        { "t": "include", "name": "compliance-common" },
-
-        { "t": "ensure_file",
-            "file": "/lib/svc/manifest/site/compliance-tofino.xml",
-            "src": "compliance-tofino.xml",
-            "owner": "root", "group": "bin", "mode": "0644" },
-
-        { "t": "ensure_file",
-            "file": "/var/svc/profile/site.xml",
-            "src": "site-compliance.xml",
-            "owner": "root", "group": "root", "mode": "644" },
-
-        { "t": "include", "with": "stress", "name": "stress" },
-
-        { "t": "include", "name": "root-noauth" },
-
-        { "t": "ensure_dir",
-            "dir": "/usr/share/compliance",
-            "owner": "root", "group": "sys", "mode": "0755" },
-        { "t": "ensure_file",
-            "file": "/usr/share/compliance/dendrite-asic.tar.gz",
-            "extsrc": "dendrite/dendrite-asic.tar.gz",
-            "owner": "root", "group": "sys", "mode": "0644" },
-        { "t": "ensure_file",
-            "file": "/usr/bin/pilot",
-            "extsrc": "pilot/pilot",
-            "owner": "root", "group": "bin", "mode": "0755" },
-        { "t": "ensure_file",
-            "file": "/usr/share/compliance/pilot.toml",
-            "extsrc": "pilot/${pilot_profile}.toml",
-            "owner": "root", "group": "bin", "mode": "0644" },
-        { "t": "ensure_file",
-            "file": "/usr/bin/xcvradm",
-            "extsrc": "xcvradm",
-            "owner": "root", "group": "bin", "mode": "0755" },
-        { "t": "ensure_file",
-            "file": "/usr/bin/faux-mgs",
-            "extsrc": "faux-mgs",
-            "owner": "root", "group": "bin", "mode": "0755" },
-
-        { "t": "include", "with": "genproto",
-            "name": "genproto", "file": "${genproto}" },
-
-        { "t": "seed_smf", "apply_site": true }
-    ]
-}
diff --git a/tools/helios-build/src/main.rs b/tools/helios-build/src/main.rs
index ea3e7da..46cda73 100644
--- a/tools/helios-build/src/main.rs
+++ b/tools/helios-build/src/main.rs
@@ -1217,7 +1217,6 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
     opts.optopt("o", "", "output directory for image", "DIR");
     opts.optmulti("F", "", "pass extra image builder features", "KEY[=VAL]");
     opts.optflag("B", "", "include omicron1 brand");
-    opts.optopt("C", "", "compliance dock location", "DOCK");
     opts.optopt("N", "name", "image name", "NAME");
     opts.optflag("R", "", "recovery image");
     opts.optmulti("X", "", "skip this phase", "PHASE");
@@ -1235,8 +1234,7 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
 
     let log = ca.log;
     let res = opts.parse(ca.args.iter())?;
-    let cdock = res.opt_str("C");
-    let brand = res.opt_present("B") || cdock.is_some();
+    let brand = res.opt_present("B");
     let (publisher, extrepo) = if let Some(arg) = res.opt_str("p") {
         if let Some((key, val)) = arg.split_once('=') {
             (key.to_string(), Some(val.to_string()))
@@ -1450,11 +1448,6 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
             cmd.arg("-F").arg(&format!("genproto={}",
                 genproto.to_str().unwrap()));
         }
-        if let Some(cdock) = &cdock {
-            cmd.arg("-F").arg("compliance");
-            cmd.arg("-F").arg("stress");
-            cmd.arg("-E").arg(&cdock);
-        }
         cmd.arg("-E").arg(&brand_extras);
         cmd.arg("-E").arg(&projects_extras);
         cmd.arg("-F").arg(format!("repo_publisher={}", publisher));
@@ -1516,7 +1509,6 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
     }
 
     let tname = if recovery { "zfs-recovery" }
-        else if cdock.is_some() { "zfs-compliance" }
         else { "zfs" };
     info!(log, "image builder template: {}...", tname);
     let mut cmd = basecmd();
@@ -1673,16 +1665,7 @@ fn cmd_image(ca: &CommandArg) -> Result<()> {
     /*
      * Create the image and extract the checksum:
      */
-    let target_size = if cdock.is_some() {
-        /*
-         * In the compliance rack we would like to avoid running out of space,
-         * and we have no customer workloads, so using more RAM for the ramdisk
-         * pool is OK.
-         */
-        16 * 1024
-    } else {
-        4 * 1024
-    };
+    let target_size = 4 * 1024;
     info!(log, "creating Oxide boot image...");
     let mut cmd = Command::new(&mkimage);
     cmd.arg("-i").arg(&raw);