diff --git a/src/content/docs/docs/core/cli/cli-commands.md b/src/content/docs/docs/core/cli/cli-commands.md
index 71e90c598..0a2ef0c93 100644
--- a/src/content/docs/docs/core/cli/cli-commands.md
+++ b/src/content/docs/docs/core/cli/cli-commands.md
@@ -1004,10 +1004,4 @@ Execute `sqlite3` and `duckdb` commands directly with unopinionated and very lig
 
 
 
-<hr/>
-
-<small><i>
-    This document was generated automatically by
-    <a href="https://crates.io/crates/clap-markdown"><code>clap-markdown</code></a>.
-</i></small>
 
diff --git a/src/content/docs/docs/core/cli/ingest-commands/capexec.md b/src/content/docs/docs/core/cli/ingest-commands/capexec.md
index b7fb0e907..c9a4b63aa 100644
--- a/src/content/docs/docs/core/cli/ingest-commands/capexec.md
+++ b/src/content/docs/docs/core/cli/ingest-commands/capexec.md
@@ -89,7 +89,7 @@ $ surveilr capturable-exec ls --markdown > capturable-exec.md  # find CEs, try t
 ```
 
 Running `surveilr capturable-exec ls` on the
-[test-fixtures](https://github.com/opsfolio/docs.opsfolio.com/tree/main/public/test-fixtures)
+[test-fixtures](https://github.com/surveilr/www.surveilr.com/tree/main/lib/assurance/test-fixtures)
 should show something similar to this:
 
 ```bash
diff --git a/src/content/docs/docs/core/cli/ingest-commands/tasks.md b/src/content/docs/docs/core/cli/ingest-commands/tasks.md
index 387f713b7..b0970bd85 100644
--- a/src/content/docs/docs/core/cli/ingest-commands/tasks.md
+++ b/src/content/docs/docs/core/cli/ingest-commands/tasks.md
@@ -86,12 +86,8 @@ There are sample JSONL files provided that demonstrate different types of tasks:
   `osqueryi` for device security tasks such as checking multi-factor
   authentication (MFA), encrypted passwords, and more.
 
-Refer to the
-[Typical Tasks directory](https://github.com/opsfolio/resource-surveillance/tree/main/support/tasks/typical)
-for examples of JSONL files and additional details on the structure and types of
-tasks. Please review the
-[README](https://github.com/opsfolio/resource-surveillance/blob/main/support/tasks/typical/README.md)
-for installing pkgx, osquery, and other utilities as per the requirements.
+Refer to the [Typical Tasks directory](https://github.com/opsfolio/resource-surveillance/tree/main/support/tasks/typical) for examples of JSONL files and additional details on the structure and types of
+tasks. Please review the [README](https://github.com/opsfolio/resource-surveillance/blob/main/support/tasks/typical/README.md) for installing pkgx, osquery, and other utilities as per the requirements.
 
 ### Usage
 
diff --git a/src/content/docs/docs/patterns/disciplines/compliance-officer.md b/src/content/docs/docs/patterns/disciplines/compliance-officer.md
index 88aabd82c..7cc2d7d66 100644
--- a/src/content/docs/docs/patterns/disciplines/compliance-officer.md
+++ b/src/content/docs/docs/patterns/disciplines/compliance-officer.md
@@ -13,7 +13,7 @@ Compliance Officers ensure that the organization adheres to legal standards and
 
 ## Capturing Compliance Evidence with `surveilr` 
 
-Resource surveillance (`surveilr`)  provides the [file ingestion](/surveilr/reference/ingest/files#ingest-files) [command](/surveilr/reference/cli/commands/) for compliance officers to execute. This command captures compliance evidence from [Work Product Artifacts (WPAs)](/surveilr/reference/concepts/work-product-artifacts/) and store them in a [Resource Surveillance State Database (RSSD)](/surveilr/reference/concepts/resource-surveillance) named `resource-surveillance.sqlite.db`, under the [uniform_resource](/surveilr/reference/db/surveilr-state-schema/uniform_resource) table. 
+Resource surveillance (`surveilr`)  provides the [file ingestion](/docs/core/cli/ingest-commands/files#ingest-files) [command](/docs/core/cli/cli-commands/) for compliance officers to execute. This command captures compliance evidence from [Work Product Artifacts (WPAs)](/docs/core/concepts/work-product-artifacts/) and store them in a [Resource Surveillance State Database (RSSD)](/docs/core/concepts/resource-surveillance/) named `resource-surveillance.sqlite.db`, under the [uniform_resource](/docs/standard-library/rssd-schema/uniform_resource/) table. 
 
 ### Evidence Types
 
@@ -22,7 +22,7 @@ Resource surveillance (`surveilr`)  provides the [file ingestion](/surveilr/refe
 
 ### Common commands 
 
-- To [ingest files](/surveilr/reference/ingest/files#ingest-files) in the current directory:
+- To [ingest files](/docs/core/cli/ingest-commands/files/) in the current directory:
   ```bash
   $ surveilr ingest files
   ```
@@ -41,7 +41,7 @@ A company's policy might state: **“All compliance officers must create a compr
 - Ensure the framework is documented and accessible to all stakeholders.
 
 #### Using `surveilr` for Policy Compliance and Evidence Capture
-The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/surveilr/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
+The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/docs/patterns/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
 
 #### SQL Query for Verification of Compliance Framework
 
@@ -80,7 +80,7 @@ A company's policy might state: **“All compliance officers must regularly cond
 - Document the audit findings and corrective actions.
   
 #### Using `surveilr` for Policy Compliance and Evidence Capture
-The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/surveilr/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
+The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/docs/patterns/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
 
 #### SQL Query for Verification of Audits
 
@@ -115,7 +115,7 @@ A company's policy might state: **“All compliance officers must monitor and im
 - Update the compliance framework and policies accordingly.
 
 #### Using `surveilr` for Policy Compliance and Evidence Capture
-The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/surveilr/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
+The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/docs/patterns/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
 
 #### SQL Query for Verification of Regulatory Monitoring
 
@@ -154,7 +154,7 @@ A company's policy might state: **“All compliance officers must train employee
 - Ensure employees understand and adhere to compliance policies.
 
 #### Using `surveilr` for Policy Compliance and Evidence Capture
-The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/surveilr/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
+The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/docs/patterns/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
 
 #### SQL Query for Verification of Training Sessions
 
@@ -193,7 +193,7 @@ A company's policy might state: **“All compliance officers must maintain thoro
 - Ensure regular reporting to senior management and stakeholders.
   
 #### Using `surveilr` for Policy Compliance and Evidence Capture
-The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/surveilr/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
+The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/docs/patterns/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
 
 #### SQL Query for Verification of Compliance Documentation
 
@@ -228,7 +228,7 @@ A company's policy might state: **“All compliance officers must manage and mit
 - Implement measures to mitigate identified risks.
   
 #### Using `surveilr` for Policy Compliance and Evidence Capture
-The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/surveilr/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
+The next step is to use `surveilr` to ensure compliance with these policies, [capturing](/docs/patterns/disciplines/compliance-officer#capturing-compliance-evidence-with-surveilr) the necessary details and storing them under the database table.
 
 #### SQL Query for Verification of Risk Management
 
diff --git a/src/content/docs/docs/patterns/disciplines/devops.md b/src/content/docs/docs/patterns/disciplines/devops.md
index ad2c78dbf..dd1f68512 100644
--- a/src/content/docs/docs/patterns/disciplines/devops.md
+++ b/src/content/docs/docs/patterns/disciplines/devops.md
@@ -63,7 +63,7 @@ To automate tasks related to security audits and updates, DevOps engineers can u
 
 2. Remote Server Integration:
 
-    - [Merge](http://localhost:4321/docs/core/admin/merge/) data from remote servers into a consolidated RSSD using:
+    - [Merge](/docs/core/admin/merge/) data from remote servers into a consolidated RSSD using:
   
         ```bash
         $ surveilr admin merge