diff --git a/.adr-dir b/.adr-dir
deleted file mode 100644
index 7f19008f..00000000
--- a/.adr-dir
+++ /dev/null
@@ -1 +0,0 @@
-docs/arch
diff --git a/.github/workflows/build_gnu_linux.yml b/.github/workflows/build_gnu_linux.yml
index dc9d05f0..2d481ee9 100644
--- a/.github/workflows/build_gnu_linux.yml
+++ b/.github/workflows/build_gnu_linux.yml
@@ -6,9 +6,7 @@ on:
     paths-ignore:
     - 'assets/'
     - 'dist/'
-    - 'docs/'
     - 'snap/'
-    - '.adr-dir'
     - 'Dockerfile'
     - 'LICENSE'
     - 'Makefile'
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index 9309dee5..e28f9d39 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -6,9 +6,7 @@ on:
     paths-ignore:
     - 'assets/'
     - 'dist/'
-    - 'docs/'
     - 'snap/'
-    - '.adr-dir'
     - 'Dockerfile'
     - 'LICENSE'
     - 'Makefile'
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 4c837c16..85af5125 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -6,9 +6,7 @@ on:
     paths-ignore:
     - 'assets/'
     - 'dist/'
-    - 'docs/'
     - 'snap/'
-    - '.adr-dir'
     - 'Dockerfile'
     - 'LICENSE'
     - 'Makefile'
diff --git a/.github/workflows/ci-netbsd.yml b/.github/workflows/ci-netbsd.yml
new file mode 100644
index 00000000..977a0f0f
--- /dev/null
+++ b/.github/workflows/ci-netbsd.yml
@@ -0,0 +1,34 @@
+# CI NetBSD GitHub Actions workflow for monolith
+
+name: CI
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+    - 'assets/'
+    - 'dist/'
+    - 'snap/'
+    - 'Dockerfile'
+    - 'LICENSE'
+    - 'Makefile'
+    - 'monolith.nuspec'
+    - 'README.md'
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    name: Build and test (netbsd)
+    steps:
+    - name: "Checkout repository"
+      uses: actions/checkout@v4
+
+    - name: Test in NetBSD
+      uses: vmactions/netbsd-vm@v1
+      with:
+        usesh: true
+        prepare: |
+          /usr/sbin/pkg_add rust mktools gmake pkgconf cwrappers
+        run: |
+          cargo build --all --locked --verbose --no-default-features
+          cargo test --all --locked --verbose --no-default-features
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97629c9a..75219899 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,9 +8,7 @@ on:
     paths-ignore:
     - 'assets/'
     - 'dist/'
-    - 'docs/'
     - 'snap/'
-    - '.adr-dir'
     - 'Dockerfile'
     - 'LICENSE'
     - 'Makefile'
@@ -19,23 +17,19 @@ on:
 
 jobs:
   build_and_test:
-
+    name: Build and test
     strategy:
       matrix:
         os:
           - ubuntu-latest
           - macos-latest
           - windows-latest
-        rust:
-          - stable
-          - beta
-          - nightly
     runs-on: ${{ matrix.os }}
-
     steps:
     - run: git config --global core.autocrlf false
 
-    - uses: actions/checkout@v2
+    - name: "Checkout repository"
+      uses: actions/checkout@v4
 
     - name: Build
       run: cargo build --all --locked --verbose
diff --git a/README.md b/README.md
index acb7f0b8..dc4d13c8 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ scoop install main/monolith
 #### Via [Winget](https://winstall.app/apps/Y2Z.Monolith) (Windows)
 
 ```console
-winget install --id=Y2Z.Monolith  -e
+winget install --id=Y2Z.Monolith -e
 ```
 
 #### Via [MacPorts](https://ports.macports.org/port/monolith/summary) (macOS)
diff --git a/dist/run-in-container.sh b/dist/run-in-container.sh
index 4ca8b5be..0ae75c03 100755
--- a/dist/run-in-container.sh
+++ b/dist/run-in-container.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 DOCKER=docker
-PROG_NAME=monolith
-
 if which podman 2>&1 > /dev/null; then
     DOCKER=podman
 fi
+ORG_NAME=y2z
+PROG_NAME=monolith
 
-$DOCKER run --rm y2z/$PROG_NAME "$@"
+$DOCKER run --rm $ORG_NAME/$PROG_NAME "$@"