diff --git a/.github/workflows/8.1.apache.yml b/.github/workflows/8.1.apache.yml
new file mode 100644
index 0000000..88fe1a2
--- /dev/null
+++ b/.github/workflows/8.1.apache.yml
@@ -0,0 +1,67 @@
+name: Build Docker Images for PHP 8.1 with Apache
+on:
+  workflow_dispatch:
+    branches:
+      - master
+    paths:
+      - "8/8.1/Dockerfile.apache"
+      - "8/8.1/Dockerfile.apache.dev"
+  push:
+    branches:
+      - "master"
+    paths:
+      - "8/8.1/Dockerfile.apache"
+      - "8/8.1/Dockerfile.apache.dev"
+jobs:
+  docker-build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      ## Login to all 3 registries: DockerHub, GitHub Actions Container Registry, and Quay.io ##
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to the GitHub Actions Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.GHCR_TOKEN }}
+      - name: Login to the Quay.io Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ## Build and push the Docker image ##
+      - name: Build and push the Apache Production Image
+        uses: docker/build-push-action@v5
+        with:
+          context: 8/8.1
+          file: 8/8.1/Dockerfile.apache
+          build-args: |
+            PHP_VERSION=8.1
+          push: true
+          tags: |
+            islamicnetwork/php:8.1-apache
+            ghcr.io/islamic-network/php:8.1-apache
+            quay.io/islamic-network/php:8.1-apache
+      - name: Build and push the Apache Development Image
+        uses: docker/build-push-action@v5
+        with:
+          context: 8/8.1
+          file: 8/8.1/Dockerfile.apache.dev
+          build-args: |
+            PHP_VERSION=8.1
+          push: true
+          tags: |
+            islamicnetwork/php:8.1-apache-dev
+            ghcr.io/islamic-network/php:8.1-apache-dev
+            quay.io/islamic-network/php:8.1-apache-dev
diff --git a/.github/workflows/8.1.cli.yml b/.github/workflows/8.1.cli.yml
new file mode 100644
index 0000000..7bfe675
--- /dev/null
+++ b/.github/workflows/8.1.cli.yml
@@ -0,0 +1,53 @@
+name: Build Docker Images for PHP 8.1 (CLI)
+on:
+  workflow_dispatch:
+    branches:
+      - master
+    paths:
+      - "8/8.1/Dockerfile.cli"
+  push:
+    branches:
+      - "master"
+    paths:
+      - "8/8.1/Dockerfile.cli"
+jobs:
+  docker-build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      ## Login to all 3 registries: DockerHub, GitHub Actions Container Registry, and Quay.io ##
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to the GitHub Actions Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.GHCR_TOKEN }}
+      - name: Login to the Quay.io Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ## Build and push the Docker image ##
+      - name: Build and push the CLI Image
+        uses: docker/build-push-action@v5
+        with:
+          context: 8/8.1
+          file: 8/8.1/Dockerfile.cli
+          build-args: |
+            PHP_VERSION=8.1
+          push: true
+          tags: |
+            islamicnetwork/php:8.1-cli
+            ghcr.io/islamic-network/php:8.1-cli
+            quay.io/islamic-network/php:8.1-cli
diff --git a/.github/workflows/8.1.unit.yml b/.github/workflows/8.1.unit.yml
new file mode 100644
index 0000000..90dde80
--- /dev/null
+++ b/.github/workflows/8.1.unit.yml
@@ -0,0 +1,67 @@
+name: Build Docker Images for PHP 8.1 with Nginx Unit
+on:
+  workflow_dispatch:
+    branches:
+      - master
+    paths:
+      - "8/8.1/Dockerfile.nunit"
+      - "8/8.1/Dockerfile.nunit.dev"
+  push:
+    branches:
+      - "master"
+    paths:
+      - "8/8.1/Dockerfile.nunit"
+      - "8/8.1/Dockerfile.nunit.dev"
+jobs:
+  docker-build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      ## Login to all 3 registries: DockerHub, GitHub Actions Container Registry, and Quay.io ##
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to the GitHub Actions Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.GHCR_TOKEN }}
+      - name: Login to the Quay.io Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      ## Build and push the Docker image ##
+      - name: Build and push the Unit Production Image
+        uses: docker/build-push-action@v5
+        with:
+          context: 8/8.1
+          file: 8/8.1/Dockerfile.nunit
+          build-args: |
+            PHP_VERSION=8.1
+          push: true
+          tags: |
+            islamicnetwork/php:8.1-unit
+            ghcr.io/islamic-network/php:8.1-unit
+            quay.io/islamic-network/php:8.1-unit
+      - name: Build and push the Unit Development Image
+        uses: docker/build-push-action@v5
+        with:
+          context: 8/8.1
+          file: 8/8.1/Dockerfile.nunit.dev
+          build-args: |
+            PHP_VERSION=8.1
+          push: true
+          tags: |
+            islamicnetwork/php:8.1-unit-dev
+            ghcr.io/islamic-network/php:8.1-unit-dev
+            quay.io/islamic-network/php:8.1-unit-dev