diff --git a/src/components/codeKeywords/orgAuthTokenCreator.tsx b/src/components/codeKeywords/orgAuthTokenCreator.tsx
index 0c0c511f99d354..ea97e2483257a8 100644
--- a/src/components/codeKeywords/orgAuthTokenCreator.tsx
+++ b/src/components/codeKeywords/orgAuthTokenCreator.tsx
@@ -168,7 +168,7 @@ export function OrgAuthTokenCreator() {
       <KeywordDropdown
         ref={setReferenceEl}
         role="button"
-        title="Click to generate token"
+        title="Click to generate token (DO NOT commit)"
         tabIndex={0}
         onClick={() => {
           handlePress();
@@ -192,7 +192,7 @@ export function OrgAuthTokenCreator() {
               onAnimationStart={() => setIsAnimating(true)}
               onAnimationComplete={() => setIsAnimating(false)}
             >
-              Click to generate token
+              Click to generate token (DO NOT commit)
             </Keyword>
           </AnimatePresence>
         </span>
diff --git a/src/components/orgAuthTokenNote.tsx b/src/components/orgAuthTokenNote.tsx
index 8d679d0adde539..d3e38c92c9802d 100644
--- a/src/components/orgAuthTokenNote.tsx
+++ b/src/components/orgAuthTokenNote.tsx
@@ -37,7 +37,8 @@ export function OrgAuthTokenNote() {
             manually create an Auth Token
           </ExternalLink>{' '}
           or create a token directly from this page. A created token will only be visible
-          once right after creation - make sure to copy it!
+          once right after creation - make sure to copy-paste it immediately and DO NOT
+          commit it! We recommend adding it as an environment variable.
         </Alert>
       </SignedInCheck>
     </Fragment>