diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..27fed85
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{bats,sh,yml,yaml}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index 70215be..c13c93a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@
 tests/ export-ignore
 .github/ export-ignore
 .gitattributes export-ignore
+.editorconfig export-ignore
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 62b68b7..0ff0140 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,7 @@
+## Short Summary (TL;DR)
+
+<!-- Required. One or two sentences a reviewer can read at a glance: what this changes, and why. Write it last, but put it here first. If it needs a paragraph, the detail belongs in the sections below. -->
+
 ## The Issue
 
 - Fixes #REPLACE_ME_WITH_RELATED_ISSUE_NUMBER
@@ -13,7 +17,7 @@
 <!-- If this PR changes logic, consider adding additional steps or context to the instructions below. -->
 
 ```bash
-ddev add-on get https://github.com/ddev/ddev-backstopjs/tarball/refs/pull/REPLACE_ME_WITH_THIS_PR_NUMBER/head
+ddev add-on get ddev/ddev-backstopjs --pr REPLACE_ME_WITH_THIS_PR_NUMBER
 ddev restart
 ```
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 90258d6..bf8e8de 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,13 +9,13 @@ on:
       - "**.md"
 
   schedule:
-  - cron: '25 08 * * *'
+    - cron: '25 08 * * *'
 
   workflow_dispatch:
     inputs:
       debug_enabled:
         type: boolean
-        description: Debug with tmate
+        description: Enable remote debugging session
         required: false
         default: false
 
@@ -30,10 +30,11 @@ jobs:
   tests:
     strategy:
       matrix:
+        os: [ubuntu-latest, ubuntu-26.04-arm]
         ddev_version: [stable, HEAD]
       fail-fast: false
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: ddev/github-action-add-on-test@v2