diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst
index c315f916800..7a9bfb3869f 100644
--- a/doc/source/contributor/architecture.rst
+++ b/doc/source/contributor/architecture.rst
@@ -31,23 +31,12 @@ Components
 
 Below you will find a brief explanation of the different components.
 
-::
-
-                                                  /- ( LDAP )
-                              [ Auth Manager ] ---
-                                     |            \- ( DB )
-                                     |
-                                     |
-                    cinderclient     |
-                   /             \   |                   /- [ scheduler ] -- [ volume ] -- ( iSCSI )
- [ Web Dashboard ]-               -[ api ] -- < AMQP > --
-                   \             /   |                   \- [ backup ]
-                    novaclient       |
-                                     |
-                                     |
-                                     |
-                                  < REST >
+.. figure:: ../images/architecture.png
+   :alt: Cinder architecture
+   :align: center
+   :width: 110%
 
+..
 
 * DB: sql database for data storage. Used by all components (LINKS NOT SHOWN).
 * Web Dashboard: potential external component that talks to the api.
diff --git a/doc/source/images/architecture.png b/doc/source/images/architecture.png
new file mode 100644
index 00000000000..e20c9def64a
Binary files /dev/null and b/doc/source/images/architecture.png differ