diff --git a/.editorconfig b/.editorconfig
index f8fa9393..36cd1f45 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-[*.{md,js}]
+[*.{md,js,ts}]
 quote_type = single
 indent_size = 2
 end_of_line = lf
diff --git a/canary-checker/docs/health-checks.canary.mdx b/canary-checker/docs/health-checks.canary.mdx
index 16cb4846..ec5867ba 100644
--- a/canary-checker/docs/health-checks.canary.mdx
+++ b/canary-checker/docs/health-checks.canary.mdx
@@ -4,7 +4,7 @@ title: Health Checks
 id: health-checks
 ---
 
-<img src="/img/health-checks.svg" style={{width: "900px"}}/>
+<Screenshot src="/img/health-checks.svg" style={{width: "900px"}}/>
 
 
 Canary Checker is a Kubernetes native health check platform that periodically runs various types of tests:
diff --git a/canary-checker/docs/index.mdx b/canary-checker/docs/index.mdx
index e171f2cc..af7ecdaa 100644
--- a/canary-checker/docs/index.mdx
+++ b/canary-checker/docs/index.mdx
@@ -10,7 +10,7 @@ sidebar_custom_props:
 
 ---
 
-<img src="/img/health-checks.svg" style={{width: "900px"}}/>
+<Screenshot src="/img/health-checks.svg" style={{width: "900px"}}/>
 
 
 Mission control provides the ability to define and run periodic health checks against services, infrastructure, and applications.
diff --git a/mission-control/docs/guide/config-db/index.mdx b/mission-control/docs/guide/config-db/index.mdx
index b0024fe6..35a6a433 100644
--- a/mission-control/docs/guide/config-db/index.mdx
+++ b/mission-control/docs/guide/config-db/index.mdx
@@ -17,7 +17,7 @@ The Mission Control Catalog is a centralized repository that automatically disco
 
 
 
-<img src="/img/config-db.svg" width="900px" className='pb-10'></img>
+<Screenshot src="/img/config-db.svg" width="900px" className='pb-10'/>
 
 
 
diff --git a/mission-control/docs/guide/topology/index.md b/mission-control/docs/guide/topology/index.md
index 49d438a8..07958979 100644
--- a/mission-control/docs/guide/topology/index.md
+++ b/mission-control/docs/guide/topology/index.md
@@ -18,7 +18,7 @@ Some of the benefits include:
 - **Different Views** of the same resources based on use case e.g. Platform teams might want an infra focused view, while application teams want an app focused view
 - **Partial Views** enable publishing high-level details of a component without exposing internal or private data more widely.
 
-<img src="/img/topology.svg" width="900px" className="py-3"/>
+<Screenshot src="/img/topology.svg" width="900px" className="py-3"/>
 
 A topology is comprised of:
 
@@ -31,7 +31,7 @@ A topology is comprised of:
 ## Components
 
 Components are represented as cards:
-<img src="/img/topology-card.svg" width="700px" className="pb-10"/>
+<Screenshot src="/img/topology-card.svg" width="700px" className="pb-10"/>
 
 <div style={{width: "800px"}}>
 
@@ -47,7 +47,7 @@ One way to think about a component is as a mini dashboard that has provides a de
 
 Components can be created to represent any logical view of a system, for example the below represents a FluxCD installation, mapping helm releases to pods and resources that they create.
 
-<img src="/img/flux-topology.svg" width="800px" className="py-3"/>
+<Screenshot src="/img/flux-topology.svg" width="800px" className="py-3"/>
 
 ## Components vs Config Items
 
diff --git a/mission-control/docs/installation/saas/getting-started.mdx b/mission-control/docs/installation/saas/getting-started.mdx
index 03d0f164..6cb00f0d 100644
--- a/mission-control/docs/installation/saas/getting-started.mdx
+++ b/mission-control/docs/installation/saas/getting-started.mdx
@@ -30,7 +30,7 @@ export const toc = [{
 
 When using the Mission Control SaaS the agent based approach is recommended for ingesting data, The agent is headless installation of mission-control that caches data locally in a postgres database and replicates it to the SaaS.
 
-<img src="/img/deployment-saas.svg" style={{"margin-left": "10%",  "width": "80%"}} />
+<Screenshot src="/img/deployment-saas.svg" style={{"margin-left": "10%",  "width": "80%"}} />
 
 The agent based approach has the following benefits:
 
diff --git a/modules/config-db b/modules/config-db
index bd9160b5..58ad4071 160000
--- a/modules/config-db
+++ b/modules/config-db
@@ -1 +1 @@
-Subproject commit bd9160b52094c3d6782215f6df3ae2a1a2b095ad
+Subproject commit 58ad407111b7d17a2087e339104414ccd777a175
diff --git a/modules/duty b/modules/duty
index 79ebc041..4be71479 160000
--- a/modules/duty
+++ b/modules/duty
@@ -1 +1 @@
-Subproject commit 79ebc04175f75a87d857cb2bf8c25ea6664d041f
+Subproject commit 4be71479dd467df69c7604b7a89399dee6722488
diff --git a/modules/mission-control b/modules/mission-control
index 1fb216ad..981057a9 160000
--- a/modules/mission-control
+++ b/modules/mission-control
@@ -1 +1 @@
-Subproject commit 1fb216ad7d66543312a4400e9bf12e414526c369
+Subproject commit 981057a996cee4e9f5f4445a7334308f77341fc2