diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0774bc85..22a698ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,10 @@
 name: CI/CD
 
-on: push
+on:
+  pull_request:
+    branches:
+      - master
+  workflow_call:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/combined-workflow.yml b/.github/workflows/combined-workflow.yml
index 4fd6b646..26328988 100644
--- a/.github/workflows/combined-workflow.yml
+++ b/.github/workflows/combined-workflow.yml
@@ -1,9 +1,6 @@
 name: "Combined CI/CD, Security Scan & Release Notes"
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     types: [closed]
     branches:
@@ -26,9 +23,7 @@ jobs:
   # Step 3: Release Notes
   release-notes:
     needs: security-scan
-    if: |
-      github.event.pull_request.merged == true && 
-      (always() || needs.security-scan.result == 'failure')
+    if: always() && github.event.pull_request.merged == true
     uses: ./.github/workflows/release-notes.yml
     secrets: inherit
     with:
diff --git a/README.md b/README.md
index 8492bcc5..f9ba013d 100644
--- a/README.md
+++ b/README.md
@@ -30,15 +30,15 @@ Extends official PHP Docker images with extensions and tools to be able to run S
 | Tag                                                                                         | PHP version | Linux distribution | Details                                                                                                                                                                                    | Dockerfile                                                                                 | OTEL support |
 |:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------|:------------:|
 | [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest)                 | 8.2.31      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com")                 | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.2/Dockerfile)     |      ✖       |
-| [spryker/php:8.4](https://hub.docker.com/r/spryker/php/tags?name=8.4)                       | 8.4.19      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.4.svg)](https://microbadger.com/images/spryker/php:8.4 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile)     |      ✔       |
+| [spryker/php:8.4](https://hub.docker.com/r/spryker/php/tags?name=8.4)                       | 8.4.21      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.4.svg)](https://microbadger.com/images/spryker/php:8.4 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile)     |      ✔       |
 | [spryker/php:8.3](https://hub.docker.com/r/spryker/php/tags?name=8.3)                       | 8.3.31      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.3.svg)](https://microbadger.com/images/spryker/php:8.3 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.3/Dockerfile)     |      ✔       |
 | [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2)                       | 8.2.31      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com")                       | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.2/Dockerfile)     |      ✖       |
-| [spryker/php:8.4-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.23) | 8.4.19      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile)     |      ✔       |
+| [spryker/php:8.4-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.23) | 8.4.21      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.4/Dockerfile)     |      ✔       |
 | [spryker/php:8.3-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.23) | 8.3.31      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.3/Dockerfile)     |      ✔       |
 | [spryker/php:8.2-alpine3.23](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.23) | 8.2.31      | Alpine 3.23        | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.23.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.23 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.23/8.2/Dockerfile)     |      ✖       |
 | [spryker/php:8.4-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.22) | 8.4.21      | Alpine 3.22        | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.4/Dockerfile)     |      ✔       |
 | [spryker/php:8.3-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.22) | 8.3.31      | Alpine 3.22        | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.3/Dockerfile)     |      ✔       |
-| [spryker/php:8.2-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.22) | 8.2.30      | Alpine 3.22        | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.2/Dockerfile)     |      ✔       |
+| [spryker/php:8.2-alpine3.22](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.22) | 8.2.31      | Alpine 3.22        | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.22.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.22 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.22/8.2/Dockerfile)     |      ✔       |
 | [spryker/php:8.4-alpine3.21](https://hub.docker.com/r/spryker/php/tags?name=8.4-alpine3.21) | 8.4.15      | Alpine 3.21        | [![](https://images.microbadger.com/badges/image/spryker/php:8.4-alpine3.21.svg)](https://microbadger.com/images/spryker/php:8.4-alpine3.21 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.21/8.4/Dockerfile)     |      ✔       |
 | [spryker/php:8.3-alpine3.21](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.21) | 8.3.28      | Alpine 3.21        | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.21.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.21 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.21/8.3/Dockerfile)     |      ✔       |
 | [spryker/php:8.2-alpine3.21](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.21) | 8.2.29      | Alpine 3.21        | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.21.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.21 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.21/8.2/Dockerfile)     |      ✔       |
@@ -200,7 +200,7 @@ xhprof  2.3.10  stable
 Composer
 ====================
 Composer version 2.9.3 2025-12-30 13:40:17
-PHP version 8.2.30 (/usr/local/bin/php)
+PHP version 8.2.31 (/usr/local/bin/php)
 ```
 ##### Run the following to get the report
 ```bash
diff --git a/alpine/3.22/8.2/Dockerfile b/alpine/3.22/8.2/Dockerfile
index 949511af..a22016f2 100644
--- a/alpine/3.22/8.2/Dockerfile
+++ b/alpine/3.22/8.2/Dockerfile
@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.0.2-experimental
-ARG SPRYKER_PHP_VERSION=8.2.30
+ARG SPRYKER_PHP_VERSION=8.2.31
 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.22
 
 ARG TARGETPLATFORM
diff --git a/alpine/3.23/8.4/Dockerfile b/alpine/3.23/8.4/Dockerfile
index d462d5b6..42500bcc 100644
--- a/alpine/3.23/8.4/Dockerfile
+++ b/alpine/3.23/8.4/Dockerfile
@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.0.2-experimental
-ARG SPRYKER_PHP_VERSION=8.4.19
+ARG SPRYKER_PHP_VERSION=8.4.21
 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.23
 
 ARG TARGETPLATFORM