diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4ff3bd7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Always use LF endings.
+* text eol=lf
\ No newline at end of file
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
index 213d5b8..ae26510 100644
--- a/.github/workflows/auto-pr.yml
+++ b/.github/workflows/auto-pr.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout Branch ${{ github.ref_name }}
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     -
       name: Create Pull Request
       uses: bfren/pull-request@v2
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 73a94fa..fd0b126 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
   build:
     strategy:
       fail-fast: false
@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -35,20 +35,20 @@ jobs:
         id: version
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./${{ matrix.php }}/Dockerfile
@@ -59,7 +59,7 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bfren/apache-php:php${{ matrix.php }}-dev
-            bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-beta
+            bfren/apache-php:php${{ matrix.php }}-${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d8a7889..2120a7c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -46,20 +46,20 @@ jobs:
         id: version
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./${{ matrix.php }}/Dockerfile
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 14fd935..7fc7506 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -15,10 +15,10 @@ jobs:
         shell: bash
       -
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 6b7899a..6a5186c 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./5.6/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php5 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./5.6/overlay /
-
 RUN bf-install
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
index 38cd0c0..417fd92 100644
--- a/7.4/Dockerfile
+++ b/7.4/Dockerfile
@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./7.4/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php7 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./7.4/overlay /
-
 RUN bf-install
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index d059a04..5099b2e 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./8.0/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php8 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./8.0/overlay /
-
 RUN bf-install
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
index e75342e..74b130d 100644
--- a/8.1/Dockerfile
+++ b/8.1/Dockerfile
@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./8.1/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php8 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./8.1/overlay /
-
 RUN bf-install
diff --git a/8.1/overlay/tmp/PHP_BUILD b/8.1/overlay/tmp/PHP_BUILD
index e01fb19..9633402 100644
--- a/8.1/overlay/tmp/PHP_BUILD
+++ b/8.1/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.1.23-r0
\ No newline at end of file
+8.1.25-r0
\ No newline at end of file
diff --git a/8.1/overlay/tmp/PHP_REVISION b/8.1/overlay/tmp/PHP_REVISION
index 90e30ae..c6da201 100644
--- a/8.1/overlay/tmp/PHP_REVISION
+++ b/8.1/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.1.23
\ No newline at end of file
+8.1.25
\ No newline at end of file
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
index 856f99a..3e7bdba 100644
--- a/8.2/Dockerfile
+++ b/8.2/Dockerfile
@@ -5,6 +5,9 @@ LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-ph
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./8.2/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php8 \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./8.2/overlay /
-
 RUN bf-install
diff --git a/8.2/overlay/tmp/PHP_BUILD b/8.2/overlay/tmp/PHP_BUILD
index 2c28853..cca7170 100644
--- a/8.2/overlay/tmp/PHP_BUILD
+++ b/8.2/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.2.10-r0
\ No newline at end of file
+8.2.12-r0
\ No newline at end of file
diff --git a/8.2/overlay/tmp/PHP_REVISION b/8.2/overlay/tmp/PHP_REVISION
index 2004ae6..8f8090d 100644
--- a/8.2/overlay/tmp/PHP_REVISION
+++ b/8.2/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.2.10
\ No newline at end of file
+8.2.12
\ No newline at end of file
diff --git a/Dockerfile.esh b/Dockerfile.esh
index 70008d0..448e3bb 100644
--- a/Dockerfile.esh
+++ b/Dockerfile.esh
@@ -1,10 +1,13 @@
-FROM bfren/apache:<%= ${APACHE_BASE} %>-<%= ${BASE_REVISION} %>
+FROM bfren/apache:<%= ${APACHE_BASE} %>-<%= ${BASE_VERSION} %>
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
 ARG BF_IMAGE
 ARG BF_VERSION
 
+COPY ./overlay /
+COPY ./<%= ${PHP_MINOR} %>/overlay /
+
 ENV \
     # PHP config directory
     PHP_DIR=/etc/php<%= ${PHP_MAJOR} %> \
@@ -30,7 +33,4 @@ ENV \
     # php.ini override: session_max_lifetime
     PHP_SESSION_MAX_LIFETIME=86400
 
-COPY ./overlay /
-COPY ./<%= ${PHP_MINOR} %>/overlay /
-
 RUN bf-install
diff --git a/LICENSE b/LICENSE
index 1674874..06c6f55 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 bfren
+Copyright (c) 2020-2024 bfren
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index f0dd478..4d02914 100644
--- a/README.md
+++ b/README.md
@@ -19,4 +19,4 @@ Apache2 plus PHP (5.6, 7.4, 8.0, 8.1 and 8.2) - no SSL support etc, designed to
 
 ## Copyright
 
-> Copyright (c) 2020-2023 [bfren](https://bfren.dev) (unless otherwise stated)
+> Copyright (c) 2020-2024 [bfren](https://bfren.dev) (unless otherwise stated)
diff --git a/VERSION b/VERSION
index 312883d..0c89fc9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.15
\ No newline at end of file
+4.0.0
\ No newline at end of file
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
index e440e5c..bf0d87a 100644
--- a/VERSION_MAJOR
+++ b/VERSION_MAJOR
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index f398a20..389f774 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-3.0
\ No newline at end of file
+4.0
\ No newline at end of file
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
index 2fd71e8..706bf7a 100755
--- a/generate-dockerfiles.sh
+++ b/generate-dockerfiles.sh
@@ -4,8 +4,8 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="3.0.10"
-echo "Base: ${BASE_REVISION}"
+BASE_VERSION="3.0.10"
+echo "Base: ${BASE_VERSION}"
 
 PHP_VERSIONS="5.6 7.4 8.0 8.1 8.2"
 for V in ${PHP_VERSIONS} ; do
@@ -19,7 +19,7 @@ for V in ${PHP_VERSIONS} ; do
         -e BF_DEBUG=0 \
         bfren/alpine esh \
         "/ws/Dockerfile.esh" \
-        BASE_REVISION=${BASE_REVISION} \
+        BASE_VERSION=${BASE_VERSION} \
         APACHE_BASE=${APACHE_BASE} \
         PHP_MAJOR=${PHP_MAJOR} \
         PHP_MINOR=${V}