diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 645df58..dcce877 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['8.0', '8.1', '8.2', '8.3']
+        version: ['8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout code
diff --git a/8.1-oci8-nginx-prod/Dockerfile b/8.1-oci8-nginx-prod/Dockerfile
deleted file mode 100644
index 5b3b242..0000000
--- a/8.1-oci8-nginx-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.1-nginx-prod
-
-ENV LD_LIBRARY_PATH /usr/local/instantclient
-ENV ORACLE_HOME /usr/local/instantclient
-
-# Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
-  curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-basic.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \
-  ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \
-  ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \
-  ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
-  ln -s ${ORACLE_HOME}/lib* /usr/lib && \
-  ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
-  ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
diff --git a/8.1-oci8-nginx/Dockerfile b/8.1-oci8-nginx/Dockerfile
deleted file mode 100644
index e441486..0000000
--- a/8.1-oci8-nginx/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.1-nginx
-
-ENV LD_LIBRARY_PATH /usr/local/instantclient
-ENV ORACLE_HOME /usr/local/instantclient
-
-# Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
-  curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-basic.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \
-  ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \
-  ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \
-  ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
-  ln -s ${ORACLE_HOME}/lib* /usr/lib && \
-  ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
-  ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
diff --git a/8.1-oci8-swoole-nginx-prod/Dockerfile b/8.1-oci8-swoole-nginx-prod/Dockerfile
deleted file mode 100644
index e19dc40..0000000
--- a/8.1-oci8-swoole-nginx-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.1-swoole-nginx-prod
-
-ENV LD_LIBRARY_PATH /usr/local/instantclient
-ENV ORACLE_HOME /usr/local/instantclient
-
-# Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
-  curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-basic.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \
-  ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \
-  ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \
-  ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
-  ln -s ${ORACLE_HOME}/lib* /usr/lib && \
-  ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
-  ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
diff --git a/8.1-oci8-swoole-nginx/Dockerfile b/8.1-oci8-swoole-nginx/Dockerfile
deleted file mode 100644
index 9d23c6f..0000000
--- a/8.1-oci8-swoole-nginx/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.1-swoole-nginx
-
-ENV LD_LIBRARY_PATH /usr/local/instantclient
-ENV ORACLE_HOME /usr/local/instantclient
-
-# Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
-  curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
-  curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-basic.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \
-  unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \
-  ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \
-  ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \
-  ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
-  ln -s ${ORACLE_HOME}/lib* /usr/lib && \
-  ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
-  ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
diff --git a/8.0-oci8-nginx/Dockerfile b/8.4-oci8-nginx-prod/Dockerfile
similarity index 84%
rename from 8.0-oci8-nginx/Dockerfile
rename to 8.4-oci8-nginx-prod/Dockerfile
index ee39086..e959444 100644
--- a/8.0-oci8-nginx/Dockerfile
+++ b/8.4-oci8-nginx-prod/Dockerfile
@@ -1,10 +1,10 @@
-FROM kooldev/php:8.0-nginx
+FROM kooldev/php:8.4-nginx-prod
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
 
 # Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
+RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
   curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
   ln -s ${ORACLE_HOME}/lib* /usr/lib && \
   ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
   ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
+  echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
+  docker-php-ext-enable oci8 && \
+  apk del $PHPIZE_DEPS
diff --git a/8.0-oci8-nginx-prod/Dockerfile b/8.4-oci8-nginx/Dockerfile
similarity index 84%
rename from 8.0-oci8-nginx-prod/Dockerfile
rename to 8.4-oci8-nginx/Dockerfile
index 0e9a574..98d17a0 100644
--- a/8.0-oci8-nginx-prod/Dockerfile
+++ b/8.4-oci8-nginx/Dockerfile
@@ -1,10 +1,10 @@
-FROM kooldev/php:8.0-nginx-prod
+FROM kooldev/php:8.4-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
 
 # Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
+RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
   curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
   ln -s ${ORACLE_HOME}/lib* /usr/lib && \
   ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
   ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
+  echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
+  docker-php-ext-enable oci8 && \
+  apk del $PHPIZE_DEPS
diff --git a/8.0-oci8-swoole-nginx/Dockerfile b/8.4-oci8-swoole-nginx-prod/Dockerfile
similarity index 83%
rename from 8.0-oci8-swoole-nginx/Dockerfile
rename to 8.4-oci8-swoole-nginx-prod/Dockerfile
index 0c0f8e9..b5e28b5 100644
--- a/8.0-oci8-swoole-nginx/Dockerfile
+++ b/8.4-oci8-swoole-nginx-prod/Dockerfile
@@ -1,10 +1,10 @@
-FROM kooldev/php:8.0-swoole-nginx
+FROM kooldev/php:8.4-swoole-nginx-prod
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
 
 # Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
+RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
   curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
   ln -s ${ORACLE_HOME}/lib* /usr/lib && \
   ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
   ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
+  echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
+  docker-php-ext-enable oci8 && \
+  apk del $PHPIZE_DEPS
diff --git a/8.0-oci8-swoole-nginx-prod/Dockerfile b/8.4-oci8-swoole-nginx/Dockerfile
similarity index 84%
rename from 8.0-oci8-swoole-nginx-prod/Dockerfile
rename to 8.4-oci8-swoole-nginx/Dockerfile
index 742a8aa..04df998 100644
--- a/8.0-oci8-swoole-nginx-prod/Dockerfile
+++ b/8.4-oci8-swoole-nginx/Dockerfile
@@ -1,10 +1,10 @@
-FROM kooldev/php:8.0-swoole-nginx-prod
+FROM kooldev/php:8.4-swoole-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
 
 # Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
+RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
   curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
   ln -s ${ORACLE_HOME}/lib* /usr/lib && \
   ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
   ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
+  echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
+  docker-php-ext-enable oci8 && \
+  apk del $PHPIZE_DEPS
diff --git a/README.md b/README.md
index aec89f7..245039a 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,16 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 
 ## Available Tags
 
+### 8.4
+
+- [8.4-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-nginx/Dockerfile)
+- [8.4-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-nginx-prod/Dockerfile)
+
+### 8.4 with Swoole
+
+- [8.4-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-swoole-nginx/Dockerfile)
+- [8.4-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-swoole-nginx-prod/Dockerfile)
+
 ### 8.3
 
 - [8.3-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-nginx/Dockerfile)
@@ -26,26 +36,6 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 - [8.2-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-swoole-nginx/Dockerfile)
 - [8.2-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-swoole-nginx-prod/Dockerfile)
 
-### 8.1
-
-- [8.1-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-nginx/Dockerfile)
-- [8.1-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-nginx-prod/Dockerfile)
-
-### 8.1 with Swoole
-
-- [8.1-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-swoole-nginx/Dockerfile)
-- [8.1-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-swoole-nginx-prod/Dockerfile)
-
-### 8.0
-
-- [8.0-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-nginx/Dockerfile)
-- [8.0-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-nginx-prod/Dockerfile)
-
-### 8.0 with Swoole
-
-- [8.0-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-swoole-nginx/Dockerfile)
-- [8.0-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-swoole-nginx-prod/Dockerfile)
-
 There are also older versions available like [7.4-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-oci8-nginx/Dockerfile), [7.4-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-oci8-nginx-prod/Dockerfile).
 
 ## Environment Variables
diff --git a/fwd-template.json b/fwd-template.json
index 8e995ee..eb1c997 100644
--- a/fwd-template.json
+++ b/fwd-template.json
@@ -2,57 +2,9 @@
     "output": ".",
     "builds": [
         {
-            "name": "8.0-oci8-nginx-prod",
-            "data": {
-                "from": "kooldev/php:8.0-nginx-prod"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile"
-                }
-            ]
-        },
-        {
-            "name": "8.0-oci8-nginx",
-            "data": {
-                "from": "kooldev/php:8.0-nginx"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile"
-                }
-            ]
-        },
-        {
-            "name": "8.0-oci8-swoole-nginx-prod",
-            "data": {
-                "from": "kooldev/php:8.0-swoole-nginx-prod"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile"
-                }
-            ]
-        },
-        {
-            "name": "8.0-oci8-swoole-nginx",
-            "data": {
-                "from": "kooldev/php:8.0-swoole-nginx"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile"
-                }
-            ]
-        },
-        {
-            "name": "8.1-oci8-nginx-prod",
+            "name": "8.2-oci8-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.1-nginx-prod"
+                "from": "kooldev/php:8.2-nginx-prod"
             },
             "files": [
                 {
@@ -62,9 +14,9 @@
             ]
         },
         {
-            "name": "8.1-oci8-nginx",
+            "name": "8.2-oci8-nginx",
             "data": {
-                "from": "kooldev/php:8.1-nginx"
+                "from": "kooldev/php:8.2-nginx"
             },
             "files": [
                 {
@@ -74,9 +26,9 @@
             ]
         },
         {
-            "name": "8.1-oci8-swoole-nginx-prod",
+            "name": "8.2-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.1-swoole-nginx-prod"
+                "from": "kooldev/php:8.2-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -86,9 +38,9 @@
             ]
         },
         {
-            "name": "8.1-oci8-swoole-nginx",
+            "name": "8.2-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.1-swoole-nginx"
+                "from": "kooldev/php:8.2-swoole-nginx"
             },
             "files": [
                 {
@@ -98,9 +50,9 @@
             ]
         },
         {
-            "name": "8.2-oci8-nginx-prod",
+            "name": "8.3-oci8-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.2-nginx-prod"
+                "from": "kooldev/php:8.3-nginx-prod"
             },
             "files": [
                 {
@@ -110,9 +62,9 @@
             ]
         },
         {
-            "name": "8.2-oci8-nginx",
+            "name": "8.3-oci8-nginx",
             "data": {
-                "from": "kooldev/php:8.2-nginx"
+                "from": "kooldev/php:8.3-nginx"
             },
             "files": [
                 {
@@ -122,9 +74,9 @@
             ]
         },
         {
-            "name": "8.2-oci8-swoole-nginx-prod",
+            "name": "8.3-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.2-swoole-nginx-prod"
+                "from": "kooldev/php:8.3-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -134,9 +86,9 @@
             ]
         },
         {
-            "name": "8.2-oci8-swoole-nginx",
+            "name": "8.3-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.2-swoole-nginx"
+                "from": "kooldev/php:8.3-swoole-nginx"
             },
             "files": [
                 {
@@ -146,9 +98,9 @@
             ]
         },
         {
-            "name": "8.3-oci8-nginx-prod",
+            "name": "8.4-oci8-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.3-nginx-prod"
+                "from": "kooldev/php:8.4-nginx-prod"
             },
             "files": [
                 {
@@ -158,9 +110,9 @@
             ]
         },
         {
-            "name": "8.3-oci8-nginx",
+            "name": "8.4-oci8-nginx",
             "data": {
-                "from": "kooldev/php:8.3-nginx"
+                "from": "kooldev/php:8.4-nginx"
             },
             "files": [
                 {
@@ -170,9 +122,9 @@
             ]
         },
         {
-            "name": "8.3-oci8-swoole-nginx-prod",
+            "name": "8.4-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.3-swoole-nginx-prod"
+                "from": "kooldev/php:8.4-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -182,9 +134,9 @@
             ]
         },
         {
-            "name": "8.3-oci8-swoole-nginx",
+            "name": "8.4-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.3-swoole-nginx"
+                "from": "kooldev/php:8.4-swoole-nginx"
             },
             "files": [
                 {
diff --git a/kool.yml b/kool.yml
index 2a2fa0a..7ac0aac 100644
--- a/kool.yml
+++ b/kool.yml
@@ -3,15 +3,6 @@ scripts:
     - kool docker fireworkweb/fwd:v1.0 fwd template
   build:
     - kool run template
-    - docker build --pull -t kooldev/php:8.0-oci8-nginx 8.0-oci8-nginx
-    - docker build --pull -t kooldev/php:8.0-oci8-nginx-prod 8.0-oci8-nginx-prod
-    - docker build --pull -t kooldev/php:8.0-oci8-swoole-nginx 8.0-oci8-swoole-nginx
-    - docker build --pull -t kooldev/php:8.0-oci8-swoole-nginx-prod 8.0-oci8-swoole-nginx-prod
-    - docker build --pull -t kooldev/php:8.1-oci8-nginx 8.1-oci8-nginx
-    - docker build --pull -t kooldev/php:8.1-oci8-nginx-prod 8.1-oci8-nginx-prod
-    - docker build --pull -t kooldev/php:8.1-oci8-swoole-nginx 8.1-oci8-swoole-nginx
-    - docker build --pull -t kooldev/php:8.1-oci8-swoole-nginx-prod 8.1-oci8-swoole-nginx-prod
-    - docker build --pull -t kooldev/php:8.1-oci8-swoole-nginx-prod 8.1-oci8-swoole-nginx-prod
     - docker build --pull -t kooldev/php:8.2-oci8-nginx 8.2-oci8-nginx
     - docker build --pull -t kooldev/php:8.2-oci8-nginx-prod 8.2-oci8-nginx-prod
     - docker build --pull -t kooldev/php:8.2-oci8-swoole-nginx 8.2-oci8-swoole-nginx
@@ -22,3 +13,7 @@ scripts:
     - docker build --pull -t kooldev/php:8.3-oci8-swoole-nginx 8.3-oci8-swoole-nginx
     - docker build --pull -t kooldev/php:8.3-oci8-swoole-nginx-prod 8.3-oci8-swoole-nginx-prod
     - docker build --pull -t kooldev/php:8.3-oci8-swoole-nginx-prod 8.3-oci8-swoole-nginx-prod
+    - docker build --pull -t kooldev/php:8.4-oci8-nginx 8.4-oci8-nginx
+    - docker build --pull -t kooldev/php:8.4-oci8-nginx-prod 8.4-oci8-nginx-prod
+    - docker build --pull -t kooldev/php:8.4-oci8-swoole-nginx 8.4-oci8-swoole-nginx
+    - docker build --pull -t kooldev/php:8.4-oci8-swoole-nginx-prod 8.4-oci8-swoole-nginx-prod
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
index 0c78699..fe4a0c1 100644
--- a/template/Dockerfile.blade.php
+++ b/template/Dockerfile.blade.php
@@ -3,8 +3,7 @@
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
 
-# Download and unarchive Instant Client v11
-RUN apk add --update libaio libnsl && \
+RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
   curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
   curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +16,6 @@
   ln -s ${ORACLE_HOME}/lib* /usr/lib && \
   ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
   ln -s /usr/lib/libnsl.so.3  /usr/lib/libnsl.so.1 && \
-  docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
-  docker-php-ext-install oci8
+  echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
+  docker-php-ext-enable oci8 && \
+  apk del $PHPIZE_DEPS