diff --git a/.changeset/dull-bugs-build.md b/.changeset/dull-bugs-build.md
new file mode 100644
index 0000000000..7acfe2a8a2
--- /dev/null
+++ b/.changeset/dull-bugs-build.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/integration': patch
+---
+
+Ensure that all relevant config fields are properly marked as secret
diff --git a/packages/integration/config.d.ts b/packages/integration/config.d.ts
index 9c08ec03a9..44303bf25c 100644
--- a/packages/integration/config.d.ts
+++ b/packages/integration/config.d.ts
@@ -39,7 +39,7 @@ export interface Config {
        *
        * If no credential is specified anonymous access is used.
        *
-       * @visibility secret
+       * @deepVisibility secret
        * @deprecated Use `credentials` instead.
        */
       credential?: {
@@ -54,7 +54,7 @@ export interface Config {
        * If not organization matches the first credential without an organization is used.
        *
        * If no credentials are specified at all, either a default credential (for Azure DevOps) or anonymous access (for Azure DevOps Server) is used.
-       * @visibility secret
+       * @deepVisibility secret
        */
       credentials?: {
         clientId?: string;
diff --git a/plugins/search-backend-module-elasticsearch/config.d.ts b/plugins/search-backend-module-elasticsearch/config.d.ts
index d7fdd0cd1b..95f1588fb4 100644
--- a/plugins/search-backend-module-elasticsearch/config.d.ts
+++ b/plugins/search-backend-module-elasticsearch/config.d.ts
@@ -192,6 +192,9 @@ export interface Config {
                   password: string;
                 }
               | {
+                  /**
+                   * @visibility secret
+                   */
                   apiKey: string;
                 };
           }