diff --git a/content/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites.md b/content/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites.md
index 3de988230d..14aeb0c078 100644
--- a/content/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites.md
+++ b/content/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites.md
@@ -43,14 +43,7 @@ The built-in {% data variables.product.prodname_codeql %} query suites, `default
 
 ## Queries included in the `default` and `security-extended` query suites
 
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/c-cpp-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/csharp-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/go-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/javascript-typescript-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/python-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/ruby-built-in-queries)"
-- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries)"
+{% data reusables.code-scanning.codeql-query-tables.links-to-all-tables %}
 
 ## Further reading
 
diff --git a/data/reusables/code-scanning/codeql-query-suites-explanation.md b/data/reusables/code-scanning/codeql-query-suites-explanation.md
index 1fcc641490..56c13ef095 100644
--- a/data/reusables/code-scanning/codeql-query-suites-explanation.md
+++ b/data/reusables/code-scanning/codeql-query-suites-explanation.md
@@ -4,6 +4,13 @@ The following query suites are built into {% data variables.product.prodname_cod
 
 Each of these query suites contains a different subset of the queries included in the built-in {% data variables.product.prodname_codeql %} query pack for that language. The query suites are automatically generated using the metadata for each query. For more information, see "[Metadata for CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/metadata-for-codeql-queries/)."
 
+{% ifversion code-scanning-without-workflow %}
+<!--See lists of query tables linked in the reusable above.-->
+
+{% else %}
+
 You can identify which query suites a query is included in by browsing the [CodeQL query help documentation](https://codeql.github.com/codeql-query-help/). For each query, any suites that it is included in are displayed at the top of the page with the query metadata. For example: [Arbitrary file write during zip extraction (”Zip Slip”)](https://codeql.github.com/codeql-query-help/javascript/js-zipslip/) and [Client-side request forgery](https://codeql.github.com/codeql-query-help/javascript/js-client-side-request-forgery/).
 
+{% endif %}
+
 When you specify a query suite, the {% data variables.product.prodname_codeql %} analysis engine will run the default set of queries and any extra queries defined in the additional query suite.
diff --git a/data/reusables/code-scanning/codeql-query-suites.md b/data/reusables/code-scanning/codeql-query-suites.md
index a6975d04a2..41bd1cf828 100644
--- a/data/reusables/code-scanning/codeql-query-suites.md
+++ b/data/reusables/code-scanning/codeql-query-suites.md
@@ -2,3 +2,9 @@
   | :- | :- |
   | `security-extended` | Queries from the default suite, plus lower severity and precision queries |
   | `security-and-quality` | Queries from `security-extended`, plus maintainability and reliability queries |
+
+{% ifversion code-scanning-without-workflow %}
+
+For more information, see: [AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/built-in-codeql-query-suites)."
+
+{% endif %}
diff --git a/data/reusables/code-scanning/codeql-query-tables/links-to-all-tables.md b/data/reusables/code-scanning/codeql-query-tables/links-to-all-tables.md
new file mode 100644
index 0000000000..8d8473f5a2
--- /dev/null
+++ b/data/reusables/code-scanning/codeql-query-tables/links-to-all-tables.md
@@ -0,0 +1,8 @@
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/c-cpp-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/csharp-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/go-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/javascript-typescript-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/python-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/ruby-built-in-queries)"
+- "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries)"