diff --git a/Make/Build.sh b/Make/Build.sh
index b50d2d6..4080a67 100755
--- a/Make/Build.sh
+++ b/Make/Build.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
+set -e
+
 ## Dependencies:
-# sudo apt install m4 docker-compose-plugin docker-buildx-plugin
+# Docker v25+, .NET SDK v8+
+# sudo apt update && sudo apt install m4 dotnet-sdk-8.0 docker-compose-plugin docker-buildx-plugin
+
 
 ## Test installing in container:
 # docker run -it --rm ubuntu:jammy /bin/bash
@@ -34,12 +38,6 @@
 # Clean.sh : Shutdown compose stack and delete images.
 
 
-# Echo commands
-set -x
-
-# Exit on error
-set -e
-
 # Build Dockerfile
 function BuildDockerfile {
     # Build x64 and ARM64 targets
diff --git a/Make/Clean.sh b/Make/Clean.sh
index 94adb59..1fad3c9 100755
--- a/Make/Clean.sh
+++ b/Make/Clean.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 set -e
 
 # Delete images
diff --git a/Make/Create.sh b/Make/Create.sh
index 29c01b4..e777122 100755
--- a/Make/Create.sh
+++ b/Make/Create.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# Echo commands
-set -x
-
-# Exit on error
 set -e
 
 # Create Dockerfile from M4 file
diff --git a/Make/Down-develop.sh b/Make/Down-develop.sh
index df9569e..b6a290a 100755
--- a/Make/Down-develop.sh
+++ b/Make/Down-develop.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 set -e
 
 # Stop stack and cleanup volumes
diff --git a/Make/Down.sh b/Make/Down.sh
index ab617d9..39e150f 100755
--- a/Make/Down.sh
+++ b/Make/Down.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 set -e
 
 # Stop stack and cleanup volumes
diff --git a/Make/Test.sh b/Make/Test.sh
index 108e158..85a9137 100755
--- a/Make/Test.sh
+++ b/Make/Test.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 set -e
 
 # Create Dockerfile from M4
diff --git a/Make/Up-develop.sh b/Make/Up-develop.sh
index d336e4d..e7be976 100755
--- a/Make/Up-develop.sh
+++ b/Make/Up-develop.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 set -e
 
 # Launch stack
diff --git a/Make/Up.sh b/Make/Up.sh
index a7a1322..b6b12e7 100755
--- a/Make/Up.sh
+++ b/Make/Up.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 set -e
 
 # Launch stack
diff --git a/README.md b/README.md
index 0f20f8e..db5dc23 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ Licensed under the [MIT License][license].
 
 ## Release Notes
 
+- Version 2.2:
+  - Simplified `Dockerfile` creation by using shell scripts instead of a `Makefile` (that I found too difficult to maintain and debug).
 - Version 2.1:
   - Added ARM64 images per user [request](https://github.com/ptr727/NxWitness/issues/131).
     - Note that testing was limited to verifying that the containers run on a Raspberry Pi 5.
@@ -40,7 +42,7 @@ Images are published on [Docker Hub][hub]:
 
 Images are tagged as follows:
 
-- `latest`: Latest published version, `docker pull docker.io/ptr727/nxmeta:latest`.
+- `latest`: Latest published version, e.g. `docker pull docker.io/ptr727/nxmeta:latest`.
 - `stable`: Latest released version, e.g. `docker pull docker.io/ptr727/nxmeta:stable`.
 - `rc`: Latest RC version, e.g. `docker pull docker.io/ptr727/nxmeta:rc`.
 - `beta`: Latest Beta version, e.g. `docker pull docker.io/ptr727/nxmeta:beta`
@@ -50,7 +52,7 @@ Images are tagged as follows:
 Notes:
 
 - `latest` and `stable` may be the same version if all builds are released builds.
-- `rc` and `beta` tags are only built when RC and Beta builds are published, and may be older than current `latest` or `stable` builds.
+- `rc` and `beta` tags are only built when RC and Beta builds are published by Nx, and may be older than current `latest` or `stable` builds.
 - See [Build Process](#build-process) for determination of the "released" status of a build.
 
 The images are updated weekly, picking up the latest upstream Ubuntu updates and newly released Nx product versions.  
@@ -237,7 +239,7 @@ services:
 
 ## Product Information
 
-### Releases Information
+### Release Information
 
 - Nx Witness:
   - [Downloads API](https://nxvms.com/api/utils/downloads)
@@ -278,7 +280,7 @@ Build overview:
 - The "released" status of a build follows the same method as Nx uses in [`isBuildPublished()`][isbuildpublished] where `release_date` and `release_delivery_days` from the [Releases JSON API][nxwitness_releases] must be greater than `0`
 - [`Matrix.json`](./Make/Matrix.json) is created from the `Version.json` file and is used during pipeline builds using a [Matrix](https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs) strategy.
 - Automated builds are done using [GitHub Actions](https://docs.github.com/en/actions) and the [`BuildPublishPipeline.yml`](./.github/workflows/BuildPublishPipeline.yml) pipeline.
-- Version history is maintained and used by `CreateMatrix` such that generic tags, e.g. `latest`, will never result in a lesser version number, i.e. break-fix-forward only, see [Issue #62](https://github.com/ptr727/NxWitness/issues/62) for details on Nx re-publishing `release` builds using an older version breaking already upgraded systems.
+- Version history is maintained and used by `CreateMatrix` such that generic tags, e.g. `latest`, will never result in a lesser version number, i.e. break-fix-forward only, see [Issue #62](https://github.com/ptr727/NxWitness/issues/62) for details on Nx re-publishing "released" builds using an older version breaking already upgraded systems.
 
 Local testing:
 
diff --git a/version.json b/version.json
index e296714..cffd46d 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.1",
+  "version": "2.2",
   "publicReleaseRefSpec": [
     "^refs/heads/main$"
   ],