diff --git a/.github/rulesets/Main.json b/.github/rulesets/Main.json
index bc13723..9ee02f5 100644
--- a/.github/rulesets/Main.json
+++ b/.github/rulesets/Main.json
@@ -45,15 +45,39 @@
                 "do_not_enforce_on_create": false,
                 "required_status_checks": [
                     {
-                        "context": "merge (ghcr.io/specsnl/php85) / Merge Images",
+                        "context": "merge (ghcr.io/specsnl/php85) / runtime / Merge Images (runtime)",
                         "integration_id": 15368
                     },
                     {
-                        "context": "merge (ghcr.io/specsnl/php85/apache) / Merge Images",
+                        "context": "merge (ghcr.io/specsnl/php85) / builder / Merge Images (builder)",
                         "integration_id": 15368
                     },
                     {
-                        "context": "merge (ghcr.io/specsnl/php85/frankenphp) / Merge Images",
+                        "context": "merge (ghcr.io/specsnl/php85) / builder_nodejs / Merge Images (builder_nodejs)",
+                        "integration_id": 15368
+                    },
+                    {
+                        "context": "merge (ghcr.io/specsnl/php85/apache) / runtime / Merge Images (runtime)",
+                        "integration_id": 15368
+                    },
+                    {
+                        "context": "merge (ghcr.io/specsnl/php85/apache) / builder / Merge Images (builder)",
+                        "integration_id": 15368
+                    },
+                    {
+                        "context": "merge (ghcr.io/specsnl/php85/apache) / builder_nodejs / Merge Images (builder_nodejs)",
+                        "integration_id": 15368
+                    },
+                    {
+                        "context": "merge (ghcr.io/specsnl/php85/frankenphp) / runtime / Merge Images (runtime)",
+                        "integration_id": 15368
+                    },
+                    {
+                        "context": "merge (ghcr.io/specsnl/php85/frankenphp) / builder / Merge Images (builder)",
+                        "integration_id": 15368
+                    },
+                    {
+                        "context": "merge (ghcr.io/specsnl/php85/frankenphp) / builder_nodejs / Merge Images (builder_nodejs)",
                         "integration_id": 15368
                     }
                 ]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6545f1c..1f9537d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   build:
-    uses: specsnl/github-actions/.github/workflows/build-php.yml@2.1.0
+    uses: specsnl/github-actions/.github/workflows/build-php.yml@2.4.4
     strategy:
       fail-fast: false
       matrix:
@@ -38,7 +38,7 @@ jobs:
       dockerfile: ${{ matrix.docker.dockerfile }}
 
   merge:
-    uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.1.0
+    uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.4.4
     needs: build
     strategy:
       matrix:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e86340c..41632f7 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,7 +34,7 @@ jobs:
 
   build:
     needs: check
-    uses: specsnl/github-actions/.github/workflows/build-php.yml@2.1.0
+    uses: specsnl/github-actions/.github/workflows/build-php.yml@2.4.4
     strategy:
       fail-fast: false
       matrix:
@@ -57,7 +57,7 @@ jobs:
       dockerfile: ${{ matrix.docker.dockerfile }}
 
   merge:
-    uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.1.0
+    uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.4.4
     needs: build
     strategy:
       matrix:
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index 7f19dca..c7dea77 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   build:
-    uses: specsnl/github-actions/.github/workflows/build-php.yml@2.1.0
+    uses: specsnl/github-actions/.github/workflows/build-php.yml@2.4.4
     strategy:
       fail-fast: false
       matrix:
@@ -38,7 +38,7 @@ jobs:
       dockerfile: ${{ matrix.docker.dockerfile }}
 
   merge:
-    uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.1.0
+    uses: specsnl/github-actions/.github/workflows/merge-php.yml@2.4.4
     needs: build
     strategy:
       matrix:
diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml
index f6a9280..2f7b340 100644
--- a/Taskfile.dist.yml
+++ b/Taskfile.dist.yml
@@ -4,9 +4,9 @@ vars:
   DOCKER_REPO: ghcr.io
   DOCKER_OWNER: specsnl
   # Latatest version of Hadolint: https://hub.docker.com/r/hadolint/hadolint/tags or https://github.com/hadolint/hadolint/releases
-  HADOLINT_TAG_VERSION: v2.14.0
+  HADOLINT_TAG_VERSION: v2.15.1
   # Latest version of gomplate: https://hub.docker.com/r/hairyhenderson/gomplate/tags or https://github.com/hairyhenderson/gomplate/releases
-  GOMPLATE_TAG_VERSION: v5.1.0
+  GOMPLATE_TAG_VERSION: v5.2.0
 
 # env:
 #   BUILDKIT_PROGRESS: plain
diff --git a/apache/Dockerfile b/apache/Dockerfile
index f6ae3b7..cc146d9 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -2,7 +2,7 @@
 # check=error=true
 
 # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags
-FROM mlocati/php-extension-installer:2.11.30 AS php_extension_installer
+FROM mlocati/php-extension-installer:2.12.0 AS php_extension_installer
 
 # Latest version of PHP base image: https://hub.docker.com/_/php/tags
 FROM php:8.5.11-apache-trixie AS runtime
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index ab5beac..d017da1 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -2,7 +2,7 @@
 # check=error=true
 
 # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags
-FROM mlocati/php-extension-installer:2.11.30 AS php_extension_installer
+FROM mlocati/php-extension-installer:2.12.0 AS php_extension_installer
 
 # Latest version of PHP base image: https://hub.docker.com/_/php/tags
 FROM php:8.5.11-fpm-trixie AS runtime
diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile
index 5c97633..796c349 100644
--- a/frankenphp/Dockerfile
+++ b/frankenphp/Dockerfile
@@ -2,10 +2,10 @@
 # check=error=true
 
 # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags
-FROM mlocati/php-extension-installer:2.11.30 AS php_extension_installer
+FROM mlocati/php-extension-installer:2.12.0 AS php_extension_installer
 
-# Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags
-FROM dunglas/frankenphp:1.12.7-php8.5.9-trixie AS runtime
+# Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags or https://github.com/php/frankenphp/releases
+FROM dunglas/frankenphp:1.12.7-php8.5.11-trixie AS runtime
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/variants/frankenphp.yaml b/variants/frankenphp.yaml
index 4b64aa6..524084c 100644
--- a/variants/frankenphp.yaml
+++ b/variants/frankenphp.yaml
@@ -1,3 +1,3 @@
 image_label: FrankenPHP base image
-image_url: https://hub.docker.com/r/dunglas/frankenphp/tags
+image_url: https://hub.docker.com/r/dunglas/frankenphp/tags or https://github.com/php/frankenphp/releases
 is_frankenphp: true