diff --git a/7.4-nginx-oci8-prod/Dockerfile b/7.4-nginx-oci8-prod/Dockerfile
deleted file mode 100644
index 5edd0f0..0000000
--- a/7.4-nginx-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:7.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 && \
-  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/7.4-nginx-oci8/Dockerfile b/7.4-nginx-oci8/Dockerfile
deleted file mode 100644
index 6f4d7e4..0000000
--- a/7.4-nginx-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:7.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 && \
-  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/fwd-template.json b/fwd-template.json
index 51ddc2b..f7693eb 100644
--- a/fwd-template.json
+++ b/fwd-template.json
@@ -1,30 +1,6 @@
 {
     "output": ".",
     "builds": [
-        {
-            "name": "7.4-nginx-oci8",
-            "data": {
-                "from": "kooldev/php:7.4-nginx"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile"
-                }
-            ]
-        },
-        {
-            "name": "7.4-nginx-oci8-prod",
-            "data": {
-                "from": "kooldev/php:7.4-nginx-prod"
-            },
-            "files": [
-                {
-                    "name": "Dockerfile",
-                    "path": "template/Dockerfile"
-                }
-            ]
-        },
         {
             "name": "8.0-nginx-oci8-prod",
             "data": {
@@ -52,7 +28,7 @@
         {
             "name": "8.0-nginx-swoole-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.0-swoole-nginx-prod"
+                "from": "kooldev/php:8.0-nginx-swoole-prod"
             },
             "files": [
                 {
@@ -64,7 +40,7 @@
         {
             "name": "8.0-nginx-swoole-oci8",
             "data": {
-                "from": "kooldev/php:8.0-swoole-nginx"
+                "from": "kooldev/php:8.0-nginx-swoole"
             },
             "files": [
                 {
@@ -100,7 +76,7 @@
         {
             "name": "8.1-nginx-swoole-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.1-swoole-nginx-prod"
+                "from": "kooldev/php:8.1-nginx-swoole-prod"
             },
             "files": [
                 {
@@ -112,7 +88,7 @@
         {
             "name": "8.1-nginx-swoole-oci8",
             "data": {
-                "from": "kooldev/php:8.1-swoole-nginx"
+                "from": "kooldev/php:8.1-nginx-swoole"
             },
             "files": [
                 {
@@ -148,7 +124,7 @@
         {
             "name": "8.2-nginx-swoole-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.2-swoole-nginx-prod"
+                "from": "kooldev/php:8.2-nginx-swoole-prod"
             },
             "files": [
                 {
@@ -160,7 +136,7 @@
         {
             "name": "8.2-nginx-swoole-oci8",
             "data": {
-                "from": "kooldev/php:8.2-swoole-nginx"
+                "from": "kooldev/php:8.2-nginx-swoole"
             },
             "files": [
                 {
@@ -196,7 +172,7 @@
         {
             "name": "8.3-nginx-swoole-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.3-swoole-nginx-prod"
+                "from": "kooldev/php:8.3-nginx-swoole-prod"
             },
             "files": [
                 {
@@ -208,7 +184,7 @@
         {
             "name": "8.3-nginx-swoole-oci8",
             "data": {
-                "from": "kooldev/php:8.3-swoole-nginx"
+                "from": "kooldev/php:8.3-nginx-swoole"
             },
             "files": [
                 {