diff --git a/.github/workflows/build_7_3-main.yml b/.github/workflows/build_7_3-main.yml
index ce411e2..cbf228a 100644
--- a/.github/workflows/build_7_3-main.yml
+++ b/.github/workflows/build_7_3-main.yml
@@ -19,12 +19,6 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
-      -
-        name: Read PHP version - minor
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./7.3/PHP_MINOR
-        id: php_minor
       -
         name: Read PHP version - revision
         uses: bencgreen/read-file-action@v1
@@ -37,12 +31,6 @@ jobs:
         with:
           path: ./7.3/PHP_BUILD
         id: php_build
-      -
-        name: Read image version
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./VERSION
-        id: version
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -67,7 +55,7 @@ jobs:
           #platforms: linux/amd64,linux/arm/v7
           #platforms: linux/amd64,linux/arm64
           tags: |
-            bcgdesign/nginx-php:php-${{ steps.php_minor.outputs.content }}
+            bcgdesign/nginx-php:php-7.3
             bcgdesign/nginx-php:php-${{ steps.php_revision.outputs.content }}
             bcgdesign/nginx-php:php-${{ steps.php_build.outputs.content }}
       -
diff --git a/.github/workflows/build_7_4-dev.yml b/.github/workflows/build_7_4-dev.yml
index e874fde..0681307 100644
--- a/.github/workflows/build_7_4-dev.yml
+++ b/.github/workflows/build_7_4-dev.yml
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -42,7 +42,7 @@ jobs:
           #platforms: linux/amd64,linux/arm/v7
           #platforms: linux/amd64,linux/arm64
           tags: |
-            bcgdesign/nginx-php:dev
+            bcgdesign/nginx-php:dev-php-7
             bcgdesign/nginx-php:dev-php-7.4
       -
         name: Image digest
diff --git a/.github/workflows/build_7_4-main.yml b/.github/workflows/build_7_4-main.yml
index 3c26000..5e75350 100644
--- a/.github/workflows/build_7_4-main.yml
+++ b/.github/workflows/build_7_4-main.yml
@@ -19,18 +19,6 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
-      -
-        name: Read PHP version - major
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./7.4/PHP_MAJOR
-        id: php_major
-      -
-        name: Read PHP version - minor
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./7.4/PHP_MINOR
-        id: php_minor
       -
         name: Read PHP version - revision
         uses: bencgreen/read-file-action@v1
@@ -75,8 +63,8 @@ jobs:
           tags: |
             bcgdesign/nginx-php:latest
             bcgdesign/nginx-php:${{ steps.version.outputs.content }}
-            bcgdesign/nginx-php:php-${{ steps.php_major.outputs.content }}
-            bcgdesign/nginx-php:php-${{ steps.php_minor.outputs.content }}
+            bcgdesign/nginx-php:php-7
+            bcgdesign/nginx-php:php-7.4
             bcgdesign/nginx-php:php-${{ steps.php_revision.outputs.content }}
             bcgdesign/nginx-php:php-${{ steps.php_build.outputs.content }}
       -
diff --git a/.github/workflows/build_8_0-dev.yml b/.github/workflows/build_8_0-dev.yml
index 9389048..e12666c 100644
--- a/.github/workflows/build_8_0-dev.yml
+++ b/.github/workflows/build_8_0-dev.yml
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -43,6 +43,7 @@ jobs:
           #platforms: linux/amd64,linux/arm64
           tags: |
             bcgdesign/nginx-php:dev
+            bcgdesign/nginx-php:dev-php-8
             bcgdesign/nginx-php:dev-php-8.0
       -
         name: Image digest
diff --git a/.github/workflows/build_8_0-main.yml b/.github/workflows/build_8_0-main.yml
index 16288f4..086bb34 100644
--- a/.github/workflows/build_8_0-main.yml
+++ b/.github/workflows/build_8_0-main.yml
@@ -19,18 +19,6 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
-      -
-        name: Read PHP version - major
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./8.0/PHP_MAJOR
-        id: php_major
-      -
-        name: Read PHP version - minor
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./8.0/PHP_MINOR
-        id: php_minor
       -
         name: Read PHP version - revision
         uses: bencgreen/read-file-action@v1
@@ -73,8 +61,8 @@ jobs:
           #platforms: linux/amd64,linux/arm/v7
           #platforms: linux/amd64,linux/arm64
           tags: |
-            bcgdesign/nginx-php:php-${{ steps.php_major.outputs.content }}
-            bcgdesign/nginx-php:php-${{ steps.php_minor.outputs.content }}
+            bcgdesign/nginx-php:php-8
+            bcgdesign/nginx-php:php-8.0
             bcgdesign/nginx-php:php-${{ steps.php_revision.outputs.content }}
             bcgdesign/nginx-php:php-${{ steps.php_build.outputs.content }}
       -
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
index 09e7ff2..ed00078 100644
--- a/7.3/Dockerfile
+++ b/7.3/Dockerfile
@@ -1,5 +1,4 @@
-# Use version from Alpine 3.12 branch
-FROM bcgdesign/nginx:1.1.0
+FROM bcgdesign/nginx:alpine-3.12-1.2.2
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="Nginx + PHP" \
@@ -34,6 +33,3 @@ RUN export PHP_VERSION=$(cat /tmp/PHP_BUILD) \
 COPY ./overlay /
 COPY ./overlay-nginx-conf /etc/nginx/conf.d
 COPY ./7.3/php-fpm /etc/services.d/php-fpm
-
-# fix for using with old Nginx image
-RUN rm /etc/nginx/sites/localhost
diff --git a/7.3/PHP_MINOR b/7.3/PHP_MINOR
deleted file mode 100644
index a88f811..0000000
--- a/7.3/PHP_MINOR
+++ /dev/null
@@ -1 +0,0 @@
-7.3
\ No newline at end of file
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index 6854105..5310a27 100644
--- a/7.4/Dockerfile
+++ b/7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM bcgdesign/nginx:1.2.1
+FROM bcgdesign/nginx:alpine-3.13-1.2.2
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="Nginx + PHP" \
diff --git a/7.4/PHP_BUILD b/7.4/PHP_BUILD
index c79228b..adef460 100644
--- a/7.4/PHP_BUILD
+++ b/7.4/PHP_BUILD
@@ -1 +1 @@
-7.4.14-r0
\ No newline at end of file
+7.4.15-r0
\ No newline at end of file
diff --git a/7.4/PHP_MAJOR b/7.4/PHP_MAJOR
deleted file mode 100644
index c793025..0000000
--- a/7.4/PHP_MAJOR
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/7.4/PHP_MINOR b/7.4/PHP_MINOR
deleted file mode 100644
index 9904c66..0000000
--- a/7.4/PHP_MINOR
+++ /dev/null
@@ -1 +0,0 @@
-7.4
\ No newline at end of file
diff --git a/7.4/PHP_REVISION b/7.4/PHP_REVISION
index 8abf5b5..05d3c6b 100644
--- a/7.4/PHP_REVISION
+++ b/7.4/PHP_REVISION
@@ -1 +1 @@
-7.4.14
\ No newline at end of file
+7.4.15
\ No newline at end of file
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index cacb7d6..986daba 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM bcgdesign/nginx:1.2.1
+FROM bcgdesign/nginx:alpine-3.13-1.2.2
 
 LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
     org.label-schema.name="Nginx + PHP" \
diff --git a/8.0/PHP_BUILD b/8.0/PHP_BUILD
index b83d8d7..e56068f 100644
--- a/8.0/PHP_BUILD
+++ b/8.0/PHP_BUILD
@@ -1 +1 @@
-8.0.1-r0
\ No newline at end of file
+8.0.2-r0
\ No newline at end of file
diff --git a/8.0/PHP_MAJOR b/8.0/PHP_MAJOR
deleted file mode 100644
index 301160a..0000000
--- a/8.0/PHP_MAJOR
+++ /dev/null
@@ -1 +0,0 @@
-8
\ No newline at end of file
diff --git a/8.0/PHP_MINOR b/8.0/PHP_MINOR
deleted file mode 100644
index b293f64..0000000
--- a/8.0/PHP_MINOR
+++ /dev/null
@@ -1 +0,0 @@
-8.0
\ No newline at end of file
diff --git a/8.0/PHP_REVISION b/8.0/PHP_REVISION
index 5210382..608c4e7 100644
--- a/8.0/PHP_REVISION
+++ b/8.0/PHP_REVISION
@@ -1 +1 @@
-8.0.1
\ No newline at end of file
+8.0.2
\ No newline at end of file
diff --git a/Dockerfile-automated b/Dockerfile-automated
index 585a9f7..e5a56d7 100644
--- a/Dockerfile-automated
+++ b/Dockerfile-automated
@@ -16,19 +16,21 @@ ENV PHP_FPM_LOG_LEVEL="notice" \
     PHP_INI_MAX_UPLOAD="64M" \
     PHP_SESSION_MAX_LIFETIME=86400
 
-ENV PHP_DIR=/etc/php7
+ENV PHP_DIR=/etc/php8
 
-COPY ./7.4/PHP_BUILD /tmp/PHP_BUILD
+COPY ./8.0/PHP_BUILD /tmp/PHP_BUILD
 RUN export PHP_VERSION=$(cat /tmp/PHP_BUILD) \
     && echo "PHP v${PHP_VERSION}" \
     && apk -U upgrade \
     && apk add \
         bash \
-        php7=${PHP_VERSION} \
-        php7-common=${PHP_VERSION} \
-        php7-fpm=${PHP_VERSION} \
-        php7-session=${PHP_VERSION} \
+        php8=${PHP_VERSION} \
+        php8-common=${PHP_VERSION} \
+        php8-fpm=${PHP_VERSION} \
+        php8-session=${PHP_VERSION} \
+    && ln -s /usr/bin/php8 /usr/bin/php \
     && rm -rf /var/cache/apk/* /www/* /tmp/*
 
 COPY ./overlay /
-COPY ./7.4/php-fpm /etc/services.d/php-fpm
+COPY ./overlay-nginx-conf /etc/nginx/http.d
+COPY ./8.0/php-fpm /etc/services.d/php-fpm
diff --git a/VERSION b/VERSION
index cb174d5..d2d61a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.1
\ No newline at end of file
+1.2.2
\ No newline at end of file