diff --git a/.github/images/add-to-devcontainer-button.png b/.github/images/add-to-devcontainer-button.png
new file mode 100644
index 000000000..1ba42c51e
Binary files /dev/null and b/.github/images/add-to-devcontainer-button.png differ
diff --git a/.github/images/codespaces-list.png b/.github/images/codespaces-list.png
new file mode 100644
index 000000000..36f3ca1e5
Binary files /dev/null and b/.github/images/codespaces-list.png differ
diff --git a/.github/images/configure-dev-container-command.png b/.github/images/configure-dev-container-command.png
new file mode 100644
index 000000000..19703f465
Binary files /dev/null and b/.github/images/configure-dev-container-command.png differ
diff --git a/.github/images/delete-codespace-command.png b/.github/images/delete-codespace-command.png
new file mode 100644
index 000000000..12aa49290
Binary files /dev/null and b/.github/images/delete-codespace-command.png differ
diff --git a/.github/images/green-code-button.png b/.github/images/green-code-button.png
new file mode 100644
index 000000000..bbdca9c34
Binary files /dev/null and b/.github/images/green-code-button.png differ
diff --git a/.github/images/python-extensions.png b/.github/images/python-extensions.png
new file mode 100644
index 000000000..dad28516e
Binary files /dev/null and b/.github/images/python-extensions.png differ
diff --git a/.github/images/rebuild-codespace-command.png b/.github/images/rebuild-codespace-command.png
new file mode 100644
index 000000000..28a952c6f
Binary files /dev/null and b/.github/images/rebuild-codespace-command.png differ
diff --git a/.github/images/remote-connection-status.png b/.github/images/remote-connection-status.png
new file mode 100644
index 000000000..bed328bd7
Binary files /dev/null and b/.github/images/remote-connection-status.png differ
diff --git a/.github/images/run-and-debug-start-button.png b/.github/images/run-and-debug-start-button.png
new file mode 100644
index 000000000..094166499
Binary files /dev/null and b/.github/images/run-and-debug-start-button.png differ
diff --git a/.github/images/vs-code-explorer-tab.png b/.github/images/vs-code-explorer-tab.png
new file mode 100644
index 000000000..62a8f93c7
Binary files /dev/null and b/.github/images/vs-code-explorer-tab.png differ
diff --git a/.github/images/vs-code-extensions-tab.png b/.github/images/vs-code-extensions-tab.png
new file mode 100644
index 000000000..d8931ce7f
Binary files /dev/null and b/.github/images/vs-code-extensions-tab.png differ
diff --git a/.github/images/vs-code-terminal-tab.png b/.github/images/vs-code-terminal-tab.png
new file mode 100644
index 000000000..3bc484738
Binary files /dev/null and b/.github/images/vs-code-terminal-tab.png differ
diff --git a/.github/steps/1-first-codespace.md b/.github/steps/1-first-codespace.md
index 8836befbe..e4df467ba 100644
--- a/.github/steps/1-first-codespace.md
+++ b/.github/steps/1-first-codespace.md
@@ -33,13 +33,13 @@ Let's get started! We'll start up a Codespace, run the application, make a chang
 
 1. Above the files list on the right, click the green **<> Code** button.
 
-   <img width="300" alt="green code button" src="https://github.com/user-attachments/assets/a9d80b0d-4614-4b26-83dd-b4b6fefd76c9" />
+   <img width="300" alt="green code button" src="../images/green-code-button.png" />
 
 1. Select the **Codespaces** tab and click the **Create codespace on main** button. A new window will open running VS Code and it will connect to the remote Codespace. Wait a few minutes for the codespace to be created.
 
 1. Look in the bottom left of the VS Code window see the remote connection.
 
-   <img width="350" alt="remote connection status in VS Code" src="https://github.com/user-attachments/assets/35fa3230-db51-4a9d-a82b-3a1184e2e9a0"/>
+   <img width="350" alt="remote connection status in VS Code" src="../images/remote-connection-status.png"/>
 
 > [!TIP]
 > GitHub uses the [universal](https://github.com/devcontainers/images/tree/main/src/universal) Codespace image if the repository doesn't include a configuration. It includes several useful and commonly used tools.
@@ -50,11 +50,11 @@ Let's get started! We'll start up a Codespace, run the application, make a chang
 
 1. In the left sidebar, select the file **Explorer** tab and open the file `src/hello.py`.
 
-   <img width="250" alt="vs code explorer tab" src="https://github.com/user-attachments/assets/76af1f05-1fed-43ff-b362-43d1c6c6cc53" />
+   <img width="250" alt="vs code explorer tab" src="../images/vs-code-explorer-tab.png" />
 
 1. In the lower panel, select the **TERMINAL** tab.
 
-   <img width="350" alt="vs code terminal tab" src="https://github.com/user-attachments/assets/9bb493b6-167c-4414-8f39-ab9c4baa5514" />
+   <img width="350" alt="vs code terminal tab" src="../images/vs-code-terminal-tab.png" />
 
 1. Paste the following command in the Codespace's remote terminal to show the installed versions of several tools. Note the versions for comparison later.
 
diff --git a/.github/steps/2-custom-image.md b/.github/steps/2-custom-image.md
index afdc68086..01ae61d60 100644
--- a/.github/steps/2-custom-image.md
+++ b/.github/steps/2-custom-image.md
@@ -40,7 +40,7 @@ Let's create this file and set a few of the most common settings. For other opti
 
 1. After saving, VS Code likely popped up a notification that it detected a configuration change. You can **Accept** that option to rebuild the development container or manually use the Command Palette (`CTRL`+`Shift`+`P`) and run the command `Codespaces: Rebuild Container`. Select the **Rebuild** option. A full build is not necessary.
 
-   <img width="350" alt="rebuild codespace command" src="https://github.com/user-attachments/assets/2b72e1a7-68c4-4c8d-8bf1-5727a520fd0e"/>
+   <img width="350" alt="rebuild codespace command" src="../images/rebuild-codespace-command.png"/>
 
 1. Wait a few minutes for the Codespace to rebuild and VS Code to reconnect.
 
diff --git a/.github/steps/3-customize-codespace.md b/.github/steps/3-customize-codespace.md
index 5fc4c5d48..3b233fac6 100644
--- a/.github/steps/3-customize-codespace.md
+++ b/.github/steps/3-customize-codespace.md
@@ -12,7 +12,7 @@ Let's add the GitHub CLI, extensions to run the python program using VS Code, an
    Codespaces: Add Dev Container Configuration Files...
    ```
 
-   <img width="350" alt="vs code configure dev container command" src="https://github.com/user-attachments/assets/38265419-47bf-4ac8-a0fd-71ea67e2d6eb" />
+   <img width="350" alt="vs code configure dev container command" src="../images/configure-dev-container-command.png" />
 
 1. Select the option `Modify your active configuration...`.
 
@@ -39,15 +39,15 @@ Let's add the GitHub CLI, extensions to run the python program using VS Code, an
 
 1. In the left navigation, select the **Extension** tab.
 
-   <img width="200" alt="vs code extensions tab" src="https://github.com/user-attachments/assets/d7941711-e5a9-4871-83f3-c723c203bc70" />
+   <img width="200" alt="vs code extensions tab" src="../images/vs-code-extensions-tab.png" />
 
 1. Search for `python` and find entries for `Python` and `Python Debugger`.
 
-   <img width="250" alt="python extensions for vs code" src="https://github.com/user-attachments/assets/b34ef808-2023-41f2-8963-85ba04d5684b" />
+   <img width="250" alt="python extensions for vs code" src="../images/python-extensions.png" />
 
 1. Right click on each entry and select the `Add to devcontainer.json` option.
 
-   <img width="250" alt="add to devcontainer config button" src="https://github.com/user-attachments/assets/30ada390-c8a7-4175-9d83-dfa17fc83de3" />
+   <img width="250" alt="add to devcontainer config button" src="../images/add-to-devcontainer-button.png" />
 
 1. Navigate to and open the `.devcontainer/devcontainer.json` file.
 
@@ -116,7 +116,7 @@ The Dev Container specification provides multiple locations to run [lifecycle sc
 
 1. Open the VS Code Command Palette (`CTRL`+`Shift`+`P`) and run the `Codespaces: Rebuild Container` command. Select the **Rebuild** option. A full build is not necessary.
 
-   <img width="350" alt="rebuild codespace command" src="https://github.com/user-attachments/assets/2b72e1a7-68c4-4c8d-8bf1-5727a520fd0e"/>
+   <img width="350" alt="rebuild codespace command" src="../images/rebuild-codespace-command.png"/>
 
 1. Wait a few minutes for the Codespace to rebuild and VS Code to reconnect.
 
@@ -133,11 +133,11 @@ Now that you've rebuilt the codespace, let's verify the python extension, python
 
 1. In the left sidebar, click the extensions tab and verify that the Python extensions are installed and enabled.
 
-   <img width="250" alt="python extensions for vs code" src="https://github.com/user-attachments/assets/b34ef808-2023-41f2-8963-85ba04d5684b" />
+   <img width="250" alt="python extensions for vs code" src="../images/python-extensions.png" />
 
 1. In the left sidebar, select **Run and Debug** tab and then press the **Start Debugging** icon. VS Code will open the lower panel and show the run logs.
 
-   <img width="250" alt="run and debug tab pointing to start button" src="https://github.com/user-attachments/assets/63327b56-b033-4ca1-aa83-93ec076389f5"/>
+   <img width="250" alt="run and debug tab pointing to start button" src="../images/run-and-debug-start-button.png"/>
 
 1. In the lower panel, switch to the **TERMINAL** tab.
 
diff --git a/.github/steps/4-use-codespace.md b/.github/steps/4-use-codespace.md
index 5bc0de72f..a410fc511 100644
--- a/.github/steps/4-use-codespace.md
+++ b/.github/steps/4-use-codespace.md
@@ -12,11 +12,11 @@ The final test of our Codespace is to put ourselves in the position of an onboar
 
 1. Select the **Codespaces** tab to show the list of created Codespaces.
 
-   <img width="250" alt="list of codespaces" src="https://github.com/user-attachments/assets/2ed90b91-0c62-4c49-96f5-75abbb34a989" />
+   <img width="250" alt="list of codespaces" src="../images/codespaces-list.png" />
 
 1. Find the active entry, select the three dot menu `...`, and select the **Delete** command.
 
-   <img width="500" alt="delete codespace command" src="https://github.com/user-attachments/assets/911a62a5-c50f-497b-a853-6e3865886211" />
+   <img width="500" alt="delete codespace command" src="../images/delete-codespace-command.png" />
 
 > [!TIP]
 > You can manage all of your Codespaces across all projects at https://github.com/codespaces
diff --git a/.github/workflows/0-start-exercise.yml b/.github/workflows/0-start-exercise.yml
index 4fb47ea03..2c2b86e26 100644
--- a/.github/workflows/0-start-exercise.yml
+++ b/.github/workflows/0-start-exercise.yml
@@ -18,7 +18,7 @@ jobs:
     if: |
       !github.event.repository.is_template
     name: Start Exercise
-    uses: skills/exercise-toolkit/.github/workflows/start-exercise.yml@v0.5.0
+    uses: skills/exercise-toolkit/.github/workflows/start-exercise.yml@v0.8.1
     with:
       exercise-title: "Code with Codespaces"
       intro-message: "Let's create a pre-configured environment to simplify development!"
@@ -33,6 +33,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: main
 
       - name: Get response templates
         uses: actions/checkout@v4