diff --git a/_config.yml b/_config.yml
index a6f3831f..7574a3d7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,8 @@ description: >-
   It is at the center of an ecosystem of addins for EDA tools, API wrapper, deeply integrated plugins and 3rd party tools.
 
 # Links
-demo-link: https://inventree.readthedocs.io/en/latest/demo/
+demo-link:
+  internal: demo.md
 doc-link: https://inventree.readthedocs.io/en/latest/
 deploy-link:
   internal: deploy.md
diff --git a/_includes/base/header.html b/_includes/base/header.html
index 07e9519f..fe92cfff 100644
--- a/_includes/base/header.html
+++ b/_includes/base/header.html
@@ -8,6 +8,7 @@
         <div class="flex-grow xs:flex-none"></div>
 
         <nav class="md:mr-auto md:py-1 xs:ml-4 xs:pl-4 xs:border-l xs:border-gray-400	flex flex-wrap items-center text-base justify-center">
+            <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.demo-link %}">Demo</a>
             <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.deploy-link %}">Deploy</a>
             <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.doc-link %}">Docs</a>
             <a class="mr-5 hover:cm-gray-1" href="{% include fnc/link.html item=site.blog-link %}">Blog</a>
@@ -19,8 +20,6 @@
             <a class="mr-2 hover:cm-gray-1" href="#business">for <strong>business</strong></a>
             <a class="mr-2 hover:cm-gray-1" href="#edu">for <strong>edu</strong></a>
         </nav>
-        <a href="{{site.demo-link}}" class="inline-flex items-center bg-gray-100 ml-2 border-0 py-1 px-3 focus:outline-none hover:bg-gray-200 rounded text-base mt-4 md:mt-0">
-        Open demo
-      </a> {% endif %}
+        {% endif %}
     </div>
 </header>
\ No newline at end of file
diff --git a/demo.md b/demo.md
new file mode 100644
index 00000000..e9967d0e
--- /dev/null
+++ b/demo.md
@@ -0,0 +1,27 @@
+---
+title: InvenTree Demo
+---
+
+Want to take InvenTree for a spin? A working demo of InvenTree is available online at **[https://demo.inventree.org](https://demo.inventree.org)**
+
+### Login Details
+
+Multiple default accounts are provided, as detailed below. Each account is afforded a different set of permissions, so users can see the InvenTree roles/permission system in action
+
+| Username | Password | Description | Login |
+| --- | --- | --- | --- |
+| allaccess | nolimits | View / create / edit all pages and items | [log in](https://demo.inventree.org/accounts/login/?login=allaccess&password=nolimits) |
+| reader | readonly | Can view all pages but cannot create, edit or delete database records | [log in](https://demo.inventree.org/accounts/login/?login=reader&password=readonly) |
+| engineer | partsonly | Can manage parts, view stock, but no access to purchase orders or sales orders | [log in](https://demo.inventree.org/accounts/login/?login=engineer&password=partsonly) |
+| admin | inventree | Superuser account, access all areas plus administrator actions | [log in](https://demo.inventree.org/accounts/login/?login=admin&password=inventree) |
+
+### Data Persistence
+
+The InvenTree demo database resets to a known state once per day.
+
+- Database records are reset to the latest state of the [demo dataset](https://github.com/inventree/demo-dataset)
+- InvenTree software is kept up to date with the latest `inventree:master` available via docker
+
+<div markdown="span" class="alert alert-info" role="alert">
+During the update period, the demo server may be inaccessible for a few minutes.
+</div>    
\ No newline at end of file