diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5c06149..f695b80 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
 env:
   APP_NAME: 'manticore-executor'
   DOCKER_TAG: 'manticoresearch/manticore-executor'
-  PHP_VERSION: '8.4.17'
+  PHP_VERSION: '8.4.18'
   MAINTAINER: 'Manticore'
   DESC: 'Custom built PHP executor for Manticore.'
   EXTRA_NAME: 'manticore-extra'
@@ -927,4 +927,4 @@ jobs:
         with:
           name: executor
           version: "${{ needs.pack.outputs.version_full }}"
-          token: ${{ secrets.PR_TOKEN }}
+          token: ${{ secrets.PR_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b53b56b..3a3e514 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   APP_NAME: 'manticore-executor'
-  PHP_VERSION: '8.4.17'
+  PHP_VERSION: '8.4.18'
   MAINTAINER: 'Manticore'
   DESC: 'Custom built PHP executor for Manticore.'
 
@@ -81,4 +81,4 @@ jobs:
           name: artifact-${{ matrix.build_type }}-${{ matrix.arch }}
           path: |
             dist/*.tar.gz
-            dist/*.zip
+            dist/*.zip
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index cde0639..386c41d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DEV=0
 COPY . /src
 RUN apk add bash && \
   cd /src && \
-  ./build-alpine 8.4.17 0 $BUILD_DEV && \
+  ./build-alpine 8.4.18 0 $BUILD_DEV && \
   mv build/dist/bin/php /usr/bin/manticore-executor && \
   ln -s /usr/bin/manticore-executor /usr/bin/php && \
   cd ../..
diff --git a/Dockerfile-dist b/Dockerfile-dist
index 45dd505..d509855 100644
--- a/Dockerfile-dist
+++ b/Dockerfile-dist
@@ -6,7 +6,7 @@ RUN apt-get update -y && \
 COPY ./build-linux ./build-linux
 COPY ./build-bash-base.sh ./build-bash-base.sh
 COPY ./helper.sh ./helper.sh
-RUN ./build-linux 8.4.17 0 0 && \
+RUN ./build-linux 8.4.18 0 0 && \
   cp build/dist/bin/php /usr/bin/manticore-executor && \
   rm -fr build
 
diff --git a/README.md b/README.md
index 28fab0f..88f4e2a 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Manticore Executor is a custom built PHP binary which:
 
 By default, we disable all extensions and enable only those required to run our scripts.
 
-We build executor from `PHP 8.4.17` with the following extensions enabled and compiled into the executable statically:
+We build executor from `PHP 8.4.18` with the following extensions enabled and compiled into the executable statically:
 
 * pcntl
 * posix
@@ -84,10 +84,10 @@ Several scripts used to build the final package:
 * `build-linux`
 * `build-osx`
 
-The scripts accept a version of PHP as a parameter. The current version is `8.4.17`. To build the binary, you should run the following example:
+The scripts accept a version of PHP as a parameter. The current version is `8.4.18`. To build the binary, you should run the following example:
 
 ```bash
-./build-linux "8.4.17"
+./build-linux "8.4.18"
 ```
 
-The command above will build the package on Linux with **PHP** `8.4.17`. Once it's done, you can find your binary in folder `dist/bin`.
+The command above will build the package on Linux with **PHP** `8.4.18`. Once it's done, you can find your binary in folder `dist/bin`.
\ No newline at end of file
diff --git a/build-bash-base.sh b/build-bash-base.sh
index 0799752..f86adc9 100644
--- a/build-bash-base.sh
+++ b/build-bash-base.sh
@@ -33,9 +33,9 @@ if [[ -z "$SKIP_SYSTEM_DEPS"  || "$SKIP_SYSTEM_DEPS" == 0 ]]; then
 fi
 
 
-curl -sSL "https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz" | tar -xzf -
+curl -sSL "https://github.com/php/php-src/archive/refs/tags/php-${PHP_VERSION}.tar.gz" | tar -xzf -
 test -d build && rm -fr "$_"
-mv "php-$PHP_VERSION" build && cd "$_"
+mv "php-src-php-$PHP_VERSION" build && cd "$_"
 
 # Build extra extensions
 cd ext
@@ -118,7 +118,7 @@ if [[ "$BUILD_DEV" == "1" ]]; then
     # "--enable-memprof"
     # "--enable-memprof-debug"
 		#
-		# It does not work with PHP 8.4.17
+		# It does not work with PHP 8.4.18
     # "--enable-tideways-xhprof"
     # "--enable-xdebug"
   )
@@ -129,4 +129,4 @@ mkdir dist
 ./buildconf --force
 BUILD_PREFIX="$(pwd)/dist"
 
-export BUILD_EXTRA BUILD_PREFIX BUILD_STATIC
+export BUILD_EXTRA BUILD_PREFIX BUILD_STATIC
\ No newline at end of file
diff --git a/helper.sh b/helper.sh
index 404296b..83ccc0a 100644
--- a/helper.sh
+++ b/helper.sh
@@ -71,7 +71,7 @@ build_dev_conf() {
 	git checkout 68eb143bd5700a6fe041826118aeb9a13a3fcef3
 	cd ..
 
-	# It does not work with PHP 8.4.17
+	# It does not work with PHP 8.4.18
 	# git clone https://github.com/tideways/php-xhprof-extension.git tideways_xhprof && cd "$_"
 	# git checkout 7877082945fcccced12676749676af1736a00f65
 	# cd ..