diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index f61fb95..299ded3 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -10,15 +10,19 @@ Because scripts are sourced (not executed in a subshell) they run in the current
 
 ## Project structure and conventions
 
-- `bootstrap` (top-level): dispatches to a distro directory after reading `/etc/os-release`.
+- `bootstrap` (top-level): dispatches to a distro directory after reading `/etc/os-release`. Supports Ubuntu, Pop!_OS, Fedora, and Arch.
 - `*/bootstrap` (per-distro): orchestrates other scripts in that distro folder and the shared `generic/` helpers.
-- `generic/`: small reusable steps (create-ssh-key, install-jetbrains-tools, install-zsh-customizations, lazyvim, etc.). Treat these as library modules that are `source`d by distro bootstrappers.
+- `generic/`: small reusable steps (create-ssh-key, install-jetbrains-tools, install-zsh-customizations, github-auth-login/logout, add-user-to-groups, create-directories, homebrew). Treat these as library modules that are `source`d by distro bootstrappers.
 - `*/*install-*-packages` files: contain package lists and package-manager-specific commands (apt, dnf, pacman, yay). Be careful when modifying package sets — keep package-manager flags and ordering intact.
+- `test/`: contains Docker and QEMU testing infrastructure for validation (primarily for Ubuntu).
+- `scripts/`: helper scripts like `check.sh` for local syntax and shellcheck validation.
+- `Makefile`: provides convenient targets for testing, linting, and building test images.
 
 Examples to reference when changing behavior:
 - Distribution detection: `bootstrap` (reads `/etc/os-release` and branches on `ID`).
 - Arch essentials: `arch/install-essential-packages` (enables multilib, calls `pacman`, handles AUR with `yay`).
 - Ubuntu interactive flow: `ubuntu/bootstrap` (prompts with `read -p` and conditionally runs dev/desktop/media installs).
+- Fedora/Pop!_OS flow: similar interactive prompts for optional component installation.
 
 ## Interaction & side-effects to watch for
 
@@ -31,26 +35,92 @@ Examples to reference when changing behavior:
 - Preserve the `source <(curl -fsSL ...)` style where callers expect that pattern. If you introduce an alternate execution method, add a usage comment and keep backward compatibility.
 - When modifying package lists, keep package-manager specific flags (e.g., `--needed` for `pacman`, `-y`/`-qq` for `apt`) and preserve any pre-update steps (e.g., `apt-get update`).
 - Reuse `generic/` helpers rather than duplicating logic across distros.
+- The `lazyvim` generic helper has been removed — LazyVim setup was previously auto-installed but is no longer part of the bootstrap process.
 
 ## Testing and validation (how to be productive quickly)
 
-- Quick lint: run `bash -n <script>` to check syntax.
-- Static checks: run `shellcheck` (recommended) on changed scripts.
-- Safe manual test: start a disposable VM or container for the target distribution and run the top-level `source <(...)` or the distro `bootstrap` directly.
+### Local validation
 
-## Known issues and fragile areas (observations you can trust)
+Run the local validation script to check for bash syntax errors and shellcheck issues:
 
-- The top-level `bootstrap` contains a malformed `elif` for the `arch` branch (missing spacing around `[[`), and `pop_os/bootstrap` contains a garbled line in the optical-disc install section. Be conservative when editing these lines — tests and a VM run are recommended.
+```sh
+bash scripts/check.sh
+```
+
+This script:
+- Finds all bash scripts (files with a bash shebang).
+- Runs `bash -n` to check for syntax errors.
+- Runs ShellCheck to report style and correctness issues (errors only).
+- Suggests installation steps if ShellCheck is not available.
+
+You can also use the Makefile targets:
+
+```sh
+make lint          # Run shellcheck on all scripts
+make test-syntax   # Run bash -n syntax checks
+make test          # Run automated Docker tests (Ubuntu)
+make test-all      # Test all Ubuntu versions (24.04, 25.10)
+```
+
+### Docker testing (Ubuntu)
+
+Quick Docker-based testing for package installation validation:
+
+```sh
+# Interactive testing
+make test-interactive
+
+# Automated testing
+make test
+
+# Test all Ubuntu versions
+make test-all
+```
+
+See `test/README.md` for detailed Docker and QEMU testing instructions.
+
+### CI checks
+
+GitHub Actions automatically run on push/PR:
+- `.github/workflows/ci.yml`: runs bash syntax checks and ShellCheck on all shell scripts
+- `.github/workflows/test-ubuntu.yml`: runs Docker-based Ubuntu bootstrap tests on multiple Ubuntu versions (24.04, 25.10)
+
+Both workflows use ShellCheck with `--severity=error` (warnings are advisory, errors block merge).
+
+## Known issues and gaps (observations you can trust)
+
+- **Arch bootstrap incomplete**: The `arch/bootstrap` file is sparse and noted in the README as "not fully baked yet".
 
 ## What to commit and why
 
 - Keep commits small and focused: package list changes, distribution-specific fixes, or refactors of `generic/` helpers.
 - When adding non-interactive automation, add a clearly marked `_noninteractive` variant or a flag guarded by an environment variable so the interactive default remains for humans.
+- Run `bash scripts/check.sh` before committing to catch syntax errors and shellcheck issues.
+- For Ubuntu changes, consider running `make test` to validate changes in Docker.
 
 ## Where to look next (files that exemplify common tasks)
 
-- `bootstrap` (root)
-- `ubuntu/bootstrap`, `pop_os/bootstrap`, `fedora/bootstrap`, `arch/bootstrap`
-- `generic/create-ssh-key`, `generic/install-jetbrains-tools`, `arch/install-essential-packages`, `ubuntu/install-essential-packages`
-
-If any section is unclear or you'd like the file to be more prescriptive (for example adding linting CI or a non-interactive test harness), tell me which area to expand and I will iterate.
+### Core entry points
+- `bootstrap` (root): distribution detection and routing
+- `ubuntu/bootstrap`, `pop_os/bootstrap`, `fedora/bootstrap`, `arch/bootstrap`: per-distro orchestration
+
+### Package installation examples
+- `ubuntu/install-essential-packages`: apt-based package installation with proper update/upgrade flow
+- `arch/install-essential-packages`: pacman and AUR (yay) package installation with multilib
+- `fedora/install-packages`: dnf-based installation
+
+### Generic helpers
+- `generic/create-ssh-key`: SSH key generation pattern
+- `generic/install-jetbrains-tools`: third-party tool installation (Toolbox)
+- `generic/install-zsh-customizations`: shell customization setup
+- `generic/homebrew`: Homebrew installation on Linux
+- `generic/github-auth-login` / `generic/github-auth-logout`: GitHub CLI authentication
+
+### Testing infrastructure
+- `test/run-tests.sh`: main test runner script
+- `test/docker/Dockerfile.ubuntu`: interactive Docker test image
+- `test/docker/Dockerfile.ubuntu-noninteractive`: automated test image
+- `test/README.md`: comprehensive testing documentation
+- `Makefile`: convenient test and lint targets
+
+If any section is unclear or you'd like the file to be more prescriptive (for example adding specific debugging techniques or extending CI capabilities), tell me which area to expand and I will iterate.
diff --git a/bootstrap b/bootstrap
index 46b81e3..fc9d57b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -15,9 +15,6 @@ then
 elif [[ "$ID" == "fedora" ]]
 then
     source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/fedora/bootstrap)
-elif [[ -d $HOME/.config/omarchy ]]
-then
-    source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/omarchy/bootstrap)
 elif [[ "$ID" == "arch" ]]
 then
     source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/arch/bootstrap)
diff --git a/fedora/bootstrap b/fedora/bootstrap
index 59d516b..5d37437 100755
--- a/fedora/bootstrap
+++ b/fedora/bootstrap
@@ -21,9 +21,6 @@ source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/m
 # Install packages
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/fedora/install-packages)
 
-# Lazyvim
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/lazyvim)
-
 # Zsh customizations
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/install-zsh-customizations)
 
@@ -36,11 +33,5 @@ source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/m
 # Authenticate to GitHub
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-auth-login)
 
-# Add ssh key to GitHaub
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-add-key)
-
-# Logout of GitHub
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-auth-logout)
-
 # Add user to groups
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/add-user-to-groups)
diff --git a/generic/lazyvim b/generic/lazyvim
deleted file mode 100755
index 2065a56..0000000
--- a/generic/lazyvim
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/lazyvim)
-
-git clone https://github.com/LazyVim/starter ~/.config/nvim
diff --git a/pop_os/bootstrap b/pop_os/bootstrap
index 16f370a..6b59b23 100755
--- a/pop_os/bootstrap
+++ b/pop_os/bootstrap
@@ -19,9 +19,6 @@ source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/m
 # Install packages
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/pop_os/install-packages)
 
-# Lazyvim
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/lazyvim)
-
 # Homebrew
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/homebrew)
 
@@ -52,11 +49,5 @@ fi
 # Authenticate to GitHub
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-auth-login)
 
-# Add ssh key to GitHub
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-add-key)
-
-# Logout of GitHub
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-auth-logout)
-
 # Add user to groups
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/add-user-to-groups)
\ No newline at end of file
diff --git a/scripts/check.sh b/scripts/check.sh
index a0f1257..39b05db 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -8,7 +8,7 @@ TMPFILE=$(mktemp)
 trap 'rm -f "$TMPFILE"' EXIT
 
 echo "Finding bash scripts (shebang contains 'bash')..."
-find . -type f -not -path './.git/*' -exec grep -Il '^#!.*\bbash\b' {} \; > "$TMPFILE" || true
+find . -type f -not -path './.git/*' ! -name '*.md' -exec grep -Il '^#!.*\bbash\b' {} \; > "$TMPFILE" || true
 
 if [ ! -s "$TMPFILE" ]; then
   echo "No bash scripts found."
diff --git a/ubuntu/bootstrap b/ubuntu/bootstrap
index 1980b14..654244b 100755
--- a/ubuntu/bootstrap
+++ b/ubuntu/bootstrap
@@ -19,12 +19,6 @@ source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/m
 # Essential
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/ubuntu/install-essential-packages)
 
-# Lazyvim
-source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/lazyvim)
-
-# Starship - https://starship.rs/
-curl -sS https://starship.rs/install.sh | sh
-
 # Dev packages
 read -p "Install development tools? " -n 1 -r
 echo
@@ -45,12 +39,6 @@ then
 
     # Authenticate to GitHub
     source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-auth-login)
-
-    # Add ssh key to GitHaub
-    source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-add-key)
-
-    # Logout of GitHub
-    source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/github-auth-logout)
 fi
 
 # Desktop packages