diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 8e4928c..1d6fe28 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.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout code
diff --git a/8.0-oci8-nginx-prod/Dockerfile b/8.4-oci8-nginx-prod/Dockerfile
similarity index 97%
rename from 8.0-oci8-nginx-prod/Dockerfile
rename to 8.4-oci8-nginx-prod/Dockerfile
index 0e9a574..6cb7e95 100644
--- a/8.0-oci8-nginx-prod/Dockerfile
+++ b/8.4-oci8-nginx-prod/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.0-nginx-prod
+FROM kooldev/php:8.4-nginx-prod
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/8.0-oci8-nginx/Dockerfile b/8.4-oci8-nginx/Dockerfile
similarity index 97%
rename from 8.0-oci8-nginx/Dockerfile
rename to 8.4-oci8-nginx/Dockerfile
index ee39086..662c5e7 100644
--- a/8.0-oci8-nginx/Dockerfile
+++ b/8.4-oci8-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.0-nginx
+FROM kooldev/php:8.4-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/8.0-oci8-swoole-nginx-prod/Dockerfile b/8.4-oci8-swoole-nginx-prod/Dockerfile
similarity index 96%
rename from 8.0-oci8-swoole-nginx-prod/Dockerfile
rename to 8.4-oci8-swoole-nginx-prod/Dockerfile
index 742a8aa..bf5435b 100644
--- a/8.0-oci8-swoole-nginx-prod/Dockerfile
+++ b/8.4-oci8-swoole-nginx-prod/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.0-swoole-nginx-prod
+FROM kooldev/php:8.4-swoole-nginx-prod
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/8.0-oci8-swoole-nginx/Dockerfile b/8.4-oci8-swoole-nginx/Dockerfile
similarity index 97%
rename from 8.0-oci8-swoole-nginx/Dockerfile
rename to 8.4-oci8-swoole-nginx/Dockerfile
index 0c0f8e9..2c7a43c 100644
--- a/8.0-oci8-swoole-nginx/Dockerfile
+++ b/8.4-oci8-swoole-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.0-swoole-nginx
+FROM kooldev/php:8.4-swoole-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/fwd-template.json b/fwd-template.json
index 8e995ee..566db75 100644
--- a/fwd-template.json
+++ b/fwd-template.json
@@ -2,9 +2,9 @@
     "output": ".",
     "builds": [
         {
-            "name": "8.0-oci8-nginx-prod",
+            "name": "8.1-oci8-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.0-nginx-prod"
+                "from": "kooldev/php:8.1-nginx-prod"
             },
             "files": [
                 {
@@ -14,9 +14,9 @@
             ]
         },
         {
-            "name": "8.0-oci8-nginx",
+            "name": "8.1-oci8-nginx",
             "data": {
-                "from": "kooldev/php:8.0-nginx"
+                "from": "kooldev/php:8.1-nginx"
             },
             "files": [
                 {
@@ -26,9 +26,9 @@
             ]
         },
         {
-            "name": "8.0-oci8-swoole-nginx-prod",
+            "name": "8.1-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.0-swoole-nginx-prod"
+                "from": "kooldev/php:8.1-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -38,9 +38,9 @@
             ]
         },
         {
-            "name": "8.0-oci8-swoole-nginx",
+            "name": "8.1-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.0-swoole-nginx"
+                "from": "kooldev/php:8.1-swoole-nginx"
             },
             "files": [
                 {
@@ -50,9 +50,9 @@
             ]
         },
         {
-            "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 +62,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 +74,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 +86,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 +98,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 +110,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 +122,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 +134,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 +146,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 +158,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 +170,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 +182,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": [
                 {