diff --git a/README.md b/README.md
index c3f6109be..950ff31a0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Genestack](assets/images/genestack.png)
+![Genestack](docs/assets/images/genestack.png)
 
 # Welcome to Genestack: Where Cloud Meets You
 
@@ -84,4 +84,4 @@ architecture of the Genestack ecosystem.
 
 They say a picture is worth 1000 words, so here's a picture.
 
-![Genestack Architecture Diagram](assets/images/diagram-genestack.png)
+![Genestack Architecture Diagram](docs/assets/images/diagram-genestack.png)
diff --git a/assets/images/diagram-genestack.png b/docs/assets/images/diagram-genestack.png
similarity index 100%
rename from assets/images/diagram-genestack.png
rename to docs/assets/images/diagram-genestack.png
diff --git a/assets/images/favicon.ico b/docs/assets/images/favicon.ico
similarity index 100%
rename from assets/images/favicon.ico
rename to docs/assets/images/favicon.ico
diff --git a/assets/images/genestack-cropped-small.png b/docs/assets/images/genestack-cropped-small.png
similarity index 100%
rename from assets/images/genestack-cropped-small.png
rename to docs/assets/images/genestack-cropped-small.png
diff --git a/assets/images/genestack.png b/docs/assets/images/genestack.png
similarity index 100%
rename from assets/images/genestack.png
rename to docs/assets/images/genestack.png
diff --git a/assets/images/genestack.svg b/docs/assets/images/genestack.svg
similarity index 100%
rename from assets/images/genestack.svg
rename to docs/assets/images/genestack.svg
diff --git a/assets/images/genstack-local-arch-k8s-ent.svg b/docs/assets/images/genstack-local-arch-k8s-ent.svg
similarity index 100%
rename from assets/images/genstack-local-arch-k8s-ent.svg
rename to docs/assets/images/genstack-local-arch-k8s-ent.svg
diff --git a/assets/images/genstack-local-arch-k8s-flex.svg b/docs/assets/images/genstack-local-arch-k8s-flex.svg
similarity index 100%
rename from assets/images/genstack-local-arch-k8s-flex.svg
rename to docs/assets/images/genstack-local-arch-k8s-flex.svg
diff --git a/docs/assets/images/lab-diagram.png b/docs/assets/images/lab-diagram.png
new file mode 100644
index 000000000..9f4123934
Binary files /dev/null and b/docs/assets/images/lab-diagram.png differ
diff --git a/assets/images/rackspace_logo.png b/docs/assets/images/rackspace_logo.png
similarity index 100%
rename from assets/images/rackspace_logo.png
rename to docs/assets/images/rackspace_logo.png
diff --git a/assets/images/rackspace_logo.svg b/docs/assets/images/rackspace_logo.svg
similarity index 100%
rename from assets/images/rackspace_logo.svg
rename to docs/assets/images/rackspace_logo.svg
diff --git a/assets/images/source/Logical-Architecture.graffle b/docs/assets/images/source/Logical-Architecture.graffle
similarity index 100%
rename from assets/images/source/Logical-Architecture.graffle
rename to docs/assets/images/source/Logical-Architecture.graffle
diff --git a/docs/build-test-envs.md b/docs/build-test-envs.md
index d499ab596..aa093bace 100644
--- a/docs/build-test-envs.md
+++ b/docs/build-test-envs.md
@@ -99,7 +99,7 @@ The test infrastructure will create the following OpenStack resources.
 
 The result of the playbook will look something like this.
 
-![image](https://github.com/rackerlabs/genestack/assets/2066292/7c7f4230-256c-4392-9928-767edb2ad0f0)
+![image](docs/assets/images/lab-diagram.png)
 
 * The first three nodes within the build playbook will be assumed as controllers
 * The last three nodes will be assumed to be storage nodes with 3 volumes attached to them each
diff --git a/docs/index.md b/docs/index.md
index afcfd1633..2e88aa3e9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -13,7 +13,7 @@ to manage cloud infrastructure in the way you need it.
 
 They say a picture is worth 1000 words, so here's a picture.
 
-![Genestack Architecture Diagram](../assets/images/diagram-genestack.png)
+![Genestack Architecture Diagram](assets/images/diagram-genestack.png)
 
 ---