diff --git a/poetry.lock b/poetry.lock
index 2058769..c98156d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -653,15 +653,15 @@ python-versions = "*"
 
 [[package]]
 name = "zipp"
-version = "3.8.1"
+version = "3.9.0"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-testing = ["pytest-mypy (>=0.9.1)", "pytest-black (>=0.3.7)", "func-timeout", "jaraco.itertools", "pytest-enabler (>=1.3)", "pytest-cov", "pytest-flake8", "pytest-checkdocs (>=2.4)", "pytest (>=6)"]
-docs = ["jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "jaraco.packaging (>=9)", "sphinx"]
+docs = ["sphinx (>=3.5)", "jaraco.packaging (>=9)", "rst.linker (>=1.9)", "furo", "jaraco.tidelift (>=1.4)"]
+testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "flake8 (<5)", "pytest-cov", "pytest-enabler (>=1.3)", "jaraco.itertools", "func-timeout", "jaraco.functools", "more-itertools", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)"]
 
 [metadata]
 lock-version = "1.1"
@@ -985,6 +985,6 @@ wcwidth = [
     {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
 ]
 zipp = [
-    {file = "zipp-3.8.1-py3-none-any.whl", hash = "sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009"},
-    {file = "zipp-3.8.1.tar.gz", hash = "sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2"},
+    {file = "zipp-3.9.0-py3-none-any.whl", hash = "sha256:972cfa31bc2fedd3fa838a51e9bc7e64b7fb725a8c00e7431554311f180e9980"},
+    {file = "zipp-3.9.0.tar.gz", hash = "sha256:3a7af91c3db40ec72dd9d154ae18e008c69efe8ca88dde4f9a731bb82fe2f9eb"},
 ]
diff --git a/site/source/_static/images/setup/screen7-startfresh_complete.jpg b/site/source/_static/images/setup/screen7-startfresh_complete.jpg
new file mode 100644
index 0000000..da6befa
Binary files /dev/null and b/site/source/_static/images/setup/screen7-startfresh_complete.jpg differ
diff --git a/site/source/_static/images/setup/screen7-upgrade_complete.jpg b/site/source/_static/images/setup/screen7-upgrade_complete.jpg
new file mode 100644
index 0000000..e0e1290
Binary files /dev/null and b/site/source/_static/images/setup/screen7-upgrade_complete.jpg differ
diff --git a/site/source/user-manual/initial-setup.rst b/site/source/user-manual/initial-setup.rst
index 150fcf5..869a0ec 100644
--- a/site/source/user-manual/initial-setup.rst
+++ b/site/source/user-manual/initial-setup.rst
@@ -78,7 +78,7 @@ Claiming your Device
 
     .. tip:: Click "Download This Page" to save your Embassy address and certificate info on your computer.
 
-    .. figure:: /_static/images/setup/setup4.png
+    .. figure:: /_static/images/setup/screen7-startfresh_complete.jpg
       :width: 60%
       :alt: Setup Complete
 
diff --git a/site/source/user-manual/upgrade-02/upgrade-diy.rst b/site/source/user-manual/upgrade-02/upgrade-diy.rst
index 995214e..b0d8b9b 100644
--- a/site/source/user-manual/upgrade-02/upgrade-diy.rst
+++ b/site/source/user-manual/upgrade-02/upgrade-diy.rst
@@ -95,7 +95,7 @@ Power Up
 
 #. Now you will be provided with both a Tor and LAN address with which you can access your Embassy. A file download will contain this important information, which you should keep somewhere safe.  It is also a good idea to make bookmarks on the devices that you will use to access your Embassy.
 
-   .. figure:: /_static/images/setup/migrate6.png
+   .. figure:: /_static/images/setup/screen7-upgrade_complete.jpg
       :width: 60%
 
 #. To use LAN safely, the SSL certificate will need to be added to whatever device you are using to access. This can be downloaded by clicking on "Download root CA" and installed by following the :ref:`instructions<connecting-lan>`.
diff --git a/site/source/user-manual/upgrade-02/upgrade-kit.rst b/site/source/user-manual/upgrade-02/upgrade-kit.rst
index 6a84e21..df42cc9 100644
--- a/site/source/user-manual/upgrade-02/upgrade-kit.rst
+++ b/site/source/user-manual/upgrade-02/upgrade-kit.rst
@@ -74,7 +74,7 @@ Power Up
 
 #. Now you will be provided with both a Tor and LAN address with which you can access your Embassy. A file download will contain this important information, which you should keep somewhere safe.  It is also a good idea to make bookmarks on the devices that you will use to access your Embassy.
 
-   .. figure:: /_static/images/setup/migrate6.png
+   .. figure:: /_static/images/setup/screen7-upgrade_complete.jpg
       :width: 60%
 
 #. To use LAN safely, the SSL certificate will need to be added to whatever device you are using to access. This can be downloaded by clicking on "Download root CA" and installed by following the :ref:`instructions<connecting-lan>`.