diff --git a/src/node/cli.ts b/src/node/cli.ts
index 80c1e740..5e9e7153 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -67,9 +67,9 @@ interface Option<T> {
   description?: string
 
   /**
-   * Whether to print this option in --help output
+   * If marked as beta, the option is not printed unless $CS_BETA is set.
    */
-  hidden?: boolean
+  beta?: boolean
 }
 
 type OptionType<T> = T extends boolean
@@ -170,8 +170,10 @@ const options: Options<Required<Args>> = {
       Securely bind code-server via Coder Cloud with the passed name. You'll get a URL like
       https://myname.coder-cloud.com at which you can easily access your code-server instance.
       Authorization is done via GitHub.
+      This is presently beta and requires being accepted for testing.
+      See https://github.com/cdr/code-server/discussions/2137
     `,
-    hidden: true,
+    beta: true,
   },
 }
 
@@ -184,24 +186,32 @@ export const optionDescriptions = (): string[] => {
     }),
     { short: 0, long: 0 },
   )
-  return entries.filter(([_, v]) => !v.hidden).map(([k, v]) => {
-    const help = `${" ".repeat(widths.short - (v.short ? v.short.length : 0))}${v.short ? `-${v.short}` : " "} --${k} `
-    return (
-      help +
-      v.description
-        ?.trim()
-        .split(/\n/)
-        .map((line, i) => {
-          line = line.trim()
-          if (i === 0) {
-            return " ".repeat(widths.long - k.length) + line
-          }
-          return " ".repeat(widths.long + widths.short + 6) + line
-        })
-        .join("\n") +
-      (typeof v.type === "object" ? ` [${Object.values(v.type).join(", ")}]` : "")
-    )
-  })
+  return entries
+    .filter(([, v]) => {
+      // If CS_BETA is set, we show beta options but if not, then we do not want
+      // to show beta options.
+      return process.env.CS_BETA || !v.beta
+    })
+    .map(([k, v]) => {
+      const help = `${" ".repeat(widths.short - (v.short ? v.short.length : 0))}${
+        v.short ? `-${v.short}` : " "
+      } --${k} `
+      return (
+        help +
+        v.description
+          ?.trim()
+          .split(/\n/)
+          .map((line, i) => {
+            line = line.trim()
+            if (i === 0) {
+              return " ".repeat(widths.long - k.length) + line
+            }
+            return " ".repeat(widths.long + widths.short + 6) + line
+          })
+          .join("\n") +
+        (typeof v.type === "object" ? ` [${Object.values(v.type).join(", ")}]` : "")
+      )
+    })
 }
 
 export const parse = (
diff --git a/src/node/coder-cloud.ts b/src/node/coder-cloud.ts
index 3b36a2f5..f8038cbe 100644
--- a/src/node/coder-cloud.ts
+++ b/src/node/coder-cloud.ts
@@ -33,6 +33,8 @@ function runAgent(...args: string[]): Promise<void> {
 }
 
 export function coderCloudBind(csAddr: string, serverName = ""): Promise<void> {
+  logger.info("Remember --coder-bind is a beta feature and requires being accepted for testing")
+  logger.info("See https://github.com/cdr/code-server/discussions/2137")
   // addr needs to be in host:port format.
   // So we trim the protocol.
   csAddr = csAddr.replace(/^https?:\/\//, "")