diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2eb7688..b3d65af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,21 +119,21 @@ jobs:
         if: needs.await-deploy.result == 'success'
         run: |
           curl -s \
-            -H "Title: CI: Deploy succeeded" \
+            -H "Title: CI: Deployment succeeded" \
             -H "Priority: low" \
             -H "Tags: white_check_mark" \
             -H "Actions: view, Open workflow run, ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
             -H "Markdown: yes" \
-            -d $'Commit `'"${GITHUB_SHA::7}"$'` deployed successfully.\n\n> ${{ github.event.head_commit.message }}' \
+            -d $'Commit `'"${GITHUB_SHA::7}"$'` deployed successfully.\n> ${{ github.event.head_commit.message }}' \
             https://ntfy.sh/splitleaf
       - name: Notify failure
         if: needs.await-deploy.result == 'failure'
         run: |
           curl -s \
-            -H "Title: CI: Deploy failed" \
+            -H "Title: CI: Deployment failed" \
             -H "Priority: default" \
             -H "Tags: rotating_light" \
             -H "Actions: view, Open workflow run, ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
             -H "Markdown: yes" \
-            -d $'Commit `'"${GITHUB_SHA::7}"$'` failed to deploy.\n\n> ${{ github.event.head_commit.message }}' \
+            -d $'Commit `'"${GITHUB_SHA::7}"$'` failed to deploy.\n> ${{ github.event.head_commit.message }}' \
             https://ntfy.sh/splitleaf
diff --git a/tests/infrastructure/default.nix b/tests/overlay/default.nix
similarity index 100%
rename from tests/infrastructure/default.nix
rename to tests/overlay/default.nix
diff --git a/tests/infrastructure/keys/ca.crt b/tests/overlay/keys/ca.crt
similarity index 100%
rename from tests/infrastructure/keys/ca.crt
rename to tests/overlay/keys/ca.crt
diff --git a/tests/infrastructure/keys/ca.key b/tests/overlay/keys/ca.key
similarity index 100%
rename from tests/infrastructure/keys/ca.key
rename to tests/overlay/keys/ca.key
diff --git a/tests/infrastructure/keys/client1-ssh b/tests/overlay/keys/client1-ssh
similarity index 100%
rename from tests/infrastructure/keys/client1-ssh
rename to tests/overlay/keys/client1-ssh
diff --git a/tests/infrastructure/keys/client1-ssh.pub b/tests/overlay/keys/client1-ssh.pub
similarity index 100%
rename from tests/infrastructure/keys/client1-ssh.pub
rename to tests/overlay/keys/client1-ssh.pub
diff --git a/tests/infrastructure/keys/client1.crt b/tests/overlay/keys/client1.crt
similarity index 100%
rename from tests/infrastructure/keys/client1.crt
rename to tests/overlay/keys/client1.crt
diff --git a/tests/infrastructure/keys/client1.key b/tests/overlay/keys/client1.key
similarity index 100%
rename from tests/infrastructure/keys/client1.key
rename to tests/overlay/keys/client1.key
diff --git a/tests/infrastructure/keys/client2-ssh b/tests/overlay/keys/client2-ssh
similarity index 100%
rename from tests/infrastructure/keys/client2-ssh
rename to tests/overlay/keys/client2-ssh
diff --git a/tests/infrastructure/keys/client2-ssh.pub b/tests/overlay/keys/client2-ssh.pub
similarity index 100%
rename from tests/infrastructure/keys/client2-ssh.pub
rename to tests/overlay/keys/client2-ssh.pub
diff --git a/tests/infrastructure/keys/client2.crt b/tests/overlay/keys/client2.crt
similarity index 100%
rename from tests/infrastructure/keys/client2.crt
rename to tests/overlay/keys/client2.crt
diff --git a/tests/infrastructure/keys/client2.key b/tests/overlay/keys/client2.key
similarity index 100%
rename from tests/infrastructure/keys/client2.key
rename to tests/overlay/keys/client2.key
diff --git a/tests/infrastructure/keys/lighthouse.crt b/tests/overlay/keys/lighthouse.crt
similarity index 100%
rename from tests/infrastructure/keys/lighthouse.crt
rename to tests/overlay/keys/lighthouse.crt
diff --git a/tests/infrastructure/keys/lighthouse.key b/tests/overlay/keys/lighthouse.key
similarity index 100%
rename from tests/infrastructure/keys/lighthouse.key
rename to tests/overlay/keys/lighthouse.key
diff --git a/tests/infrastructure/keys/server-ssh b/tests/overlay/keys/server-ssh
similarity index 100%
rename from tests/infrastructure/keys/server-ssh
rename to tests/overlay/keys/server-ssh
diff --git a/tests/infrastructure/keys/server-ssh.pub b/tests/overlay/keys/server-ssh.pub
similarity index 100%
rename from tests/infrastructure/keys/server-ssh.pub
rename to tests/overlay/keys/server-ssh.pub
diff --git a/tests/infrastructure/keys/server.crt b/tests/overlay/keys/server.crt
similarity index 100%
rename from tests/infrastructure/keys/server.crt
rename to tests/overlay/keys/server.crt
diff --git a/tests/infrastructure/keys/server.key b/tests/overlay/keys/server.key
similarity index 100%
rename from tests/infrastructure/keys/server.key
rename to tests/overlay/keys/server.key