diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 95458bc..a9776c3 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -22,8 +22,8 @@ jobs:
           docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8 ${{ matrix.version }}-nginx-oci8
           docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8-prod ${{ matrix.version }}-nginx-oci8-prod
 
-          docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 ${{ matrix.version }}-nginx-swoole-oci8
-          docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod ${{ matrix.version }}-nginx-swoole-oci8-prod
+          docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 ${{ matrix.version }}-swoole-nginx-oci8
+          docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod ${{ matrix.version }}-swoole-nginx-oci8-prod
 
       - name: Tests
         run: |
@@ -33,8 +33,8 @@ jobs:
           docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
           docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);"
 
-          docker run kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 php -r "extension_loaded('oci8') or die(1);"
-          docker run kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod php -r "extension_loaded('oci8') or die(1);"
+          docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
+          docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);"
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
@@ -49,5 +49,5 @@ jobs:
           docker push kooldev/php:${{ matrix.version }}-nginx-oci8
           docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod
 
-          docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8
-          docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod
+          docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8
+          docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod
diff --git a/8.0-nginx-oci8-prod/Dockerfile b/8.0-nginx-oci8-prod/Dockerfile
deleted file mode 100644
index 0e9a574..0000000
--- a/8.0-nginx-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.0-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.0-nginx-oci8/Dockerfile b/8.0-nginx-oci8/Dockerfile
deleted file mode 100644
index ee39086..0000000
--- a/8.0-nginx-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.0-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-nginx-swoole-oci8-prod/Dockerfile b/8.0-nginx-swoole-oci8-prod/Dockerfile
deleted file mode 100644
index 777d325..0000000
--- a/8.0-nginx-swoole-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.0-nginx-swoole-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.0-nginx-swoole-oci8/Dockerfile b/8.0-nginx-swoole-oci8/Dockerfile
deleted file mode 100644
index 8c9997a..0000000
--- a/8.0-nginx-swoole-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.0-nginx-swoole
-
-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-nginx-oci8-prod/Dockerfile b/8.1-nginx-oci8-prod/Dockerfile
deleted file mode 100644
index 5b3b242..0000000
--- a/8.1-nginx-oci8-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-nginx-oci8/Dockerfile b/8.1-nginx-oci8/Dockerfile
deleted file mode 100644
index e441486..0000000
--- a/8.1-nginx-oci8/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-nginx-swoole-oci8-prod/Dockerfile b/8.1-nginx-swoole-oci8-prod/Dockerfile
deleted file mode 100644
index decd20f..0000000
--- a/8.1-nginx-swoole-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.1-nginx-swoole-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-nginx-swoole-oci8/Dockerfile b/8.1-nginx-swoole-oci8/Dockerfile
deleted file mode 100644
index f51e8ca..0000000
--- a/8.1-nginx-swoole-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.1-nginx-swoole
-
-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.2-nginx-oci8-prod/Dockerfile b/8.2-nginx-oci8-prod/Dockerfile
deleted file mode 100644
index 62303c4..0000000
--- a/8.2-nginx-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.2-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.2-nginx-oci8/Dockerfile b/8.2-nginx-oci8/Dockerfile
deleted file mode 100644
index 3afbecc..0000000
--- a/8.2-nginx-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.2-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.2-nginx-swoole-oci8-prod/Dockerfile b/8.2-nginx-swoole-oci8-prod/Dockerfile
deleted file mode 100644
index 0ea8048..0000000
--- a/8.2-nginx-swoole-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.2-nginx-swoole-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.2-nginx-swoole-oci8/Dockerfile b/8.2-nginx-swoole-oci8/Dockerfile
deleted file mode 100644
index dd5376c..0000000
--- a/8.2-nginx-swoole-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.2-nginx-swoole
-
-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.3-nginx-oci8-prod/Dockerfile b/8.3-nginx-oci8-prod/Dockerfile
deleted file mode 100644
index 8b5bd46..0000000
--- a/8.3-nginx-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.3-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.3-nginx-oci8/Dockerfile b/8.3-nginx-oci8/Dockerfile
deleted file mode 100644
index 96e14d2..0000000
--- a/8.3-nginx-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.3-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.3-nginx-swoole-oci8-prod/Dockerfile b/8.3-nginx-swoole-oci8-prod/Dockerfile
deleted file mode 100644
index 8609386..0000000
--- a/8.3-nginx-swoole-oci8-prod/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.3-nginx-swoole-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.3-nginx-swoole-oci8/Dockerfile b/8.3-nginx-swoole-oci8/Dockerfile
deleted file mode 100644
index e34d27b..0000000
--- a/8.3-nginx-swoole-oci8/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM kooldev/php:8.3-nginx-swoole
-
-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/README.md b/README.md
index 42d88f4..c66db62 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 
 ### 8.3 with Swoole
 
-- [8.3-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-swoole-oci8/Dockerfile)
-- [8.3-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-swoole-oci8-prod/Dockerfile)
+- [8.3-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-swoole-nginx-oci8/Dockerfile)
+- [8.3-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-swoole-nginx-oci8-prod/Dockerfile)
 
 ### 8.2
 
@@ -23,8 +23,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 
 ### 8.2 with Swoole
 
-- [8.2-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-swoole-oci8/Dockerfile)
-- [8.2-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-swoole-oci8-prod/Dockerfile)
+- [8.2-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-swoole-nginx-oci8/Dockerfile)
+- [8.2-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-swoole-nginx-oci8-prod/Dockerfile)
 
 ### 8.1
 
@@ -33,8 +33,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 
 ### 8.1 with Swoole
 
-- [8.1-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-swoole-oci8/Dockerfile)
-- [8.1-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-swoole-oci8-prod/Dockerfile)
+- [8.1-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-swoole-nginx-oci8/Dockerfile)
+- [8.1-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-swoole-nginx-oci8-prod/Dockerfile)
 
 ### 8.0
 
@@ -43,8 +43,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 
 ### 8.0 with Swoole
 
-- [8.0-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-swoole-oci8/Dockerfile)
-- [8.0-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-swoole-oci8-prod/Dockerfile)
+- [8.0-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-swoole-nginx-oci8/Dockerfile)
+- [8.0-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-swoole-nginx-oci8-prod/Dockerfile)
 
 There are also older versions available like [7.4-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-nginx-oci8/Dockerfile), [7.4-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-nginx-oci8-prod/Dockerfile).
 
diff --git a/fwd-template.json b/fwd-template.json
index f7693eb..98c797f 100644
--- a/fwd-template.json
+++ b/fwd-template.json
@@ -26,9 +26,9 @@
             ]
         },
         {
-            "name": "8.0-nginx-swoole-oci8-prod",
+            "name": "8.0-swoole-nginx-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.0-nginx-swoole-prod"
+                "from": "kooldev/php:8.0-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -38,9 +38,9 @@
             ]
         },
         {
-            "name": "8.0-nginx-swoole-oci8",
+            "name": "8.0-swoole-nginx-oci8",
             "data": {
-                "from": "kooldev/php:8.0-nginx-swoole"
+                "from": "kooldev/php:8.0-swoole-nginx"
             },
             "files": [
                 {
@@ -74,9 +74,9 @@
             ]
         },
         {
-            "name": "8.1-nginx-swoole-oci8-prod",
+            "name": "8.1-swoole-nginx-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.1-nginx-swoole-prod"
+                "from": "kooldev/php:8.1-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -86,9 +86,9 @@
             ]
         },
         {
-            "name": "8.1-nginx-swoole-oci8",
+            "name": "8.1-swoole-nginx-oci8",
             "data": {
-                "from": "kooldev/php:8.1-nginx-swoole"
+                "from": "kooldev/php:8.1-swoole-nginx"
             },
             "files": [
                 {
@@ -122,9 +122,9 @@
             ]
         },
         {
-            "name": "8.2-nginx-swoole-oci8-prod",
+            "name": "8.2-swoole-nginx-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.2-nginx-swoole-prod"
+                "from": "kooldev/php:8.2-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -134,9 +134,9 @@
             ]
         },
         {
-            "name": "8.2-nginx-swoole-oci8",
+            "name": "8.2-swoole-nginx-oci8",
             "data": {
-                "from": "kooldev/php:8.2-nginx-swoole"
+                "from": "kooldev/php:8.2-swoole-nginx"
             },
             "files": [
                 {
@@ -170,9 +170,9 @@
             ]
         },
         {
-            "name": "8.3-nginx-swoole-oci8-prod",
+            "name": "8.3-swoole-nginx-oci8-prod",
             "data": {
-                "from": "kooldev/php:8.3-nginx-swoole-prod"
+                "from": "kooldev/php:8.3-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -182,9 +182,9 @@
             ]
         },
         {
-            "name": "8.3-nginx-swoole-oci8",
+            "name": "8.3-swoole-nginx-oci8",
             "data": {
-                "from": "kooldev/php:8.3-nginx-swoole"
+                "from": "kooldev/php:8.3-swoole-nginx"
             },
             "files": [
                 {
diff --git a/kool.yml b/kool.yml
index d3e99c4..9788033 100644
--- a/kool.yml
+++ b/kool.yml
@@ -5,20 +5,20 @@ scripts:
     - kool run template
     - docker build --pull -t kooldev/php:8.0-nginx-oci8 8.0-nginx-oci8
     - docker build --pull -t kooldev/php:8.0-nginx-oci8-prod 8.0-nginx-oci8-prod
-    - docker build --pull -t kooldev/php:8.0-nginx-swoole-oci8 8.0-nginx-swoole-oci8
-    - docker build --pull -t kooldev/php:8.0-nginx-swoole-oci8-prod 8.0-nginx-swoole-oci8-prod
+    - docker build --pull -t kooldev/php:8.0-swoole-nginx-oci8 8.0-swoole-nginx-oci8
+    - docker build --pull -t kooldev/php:8.0-swoole-nginx-oci8-prod 8.0-swoole-nginx-oci8-prod
     - docker build --pull -t kooldev/php:8.1-nginx-oci8 8.1-nginx-oci8
     - docker build --pull -t kooldev/php:8.1-nginx-oci8-prod 8.1-nginx-oci8-prod
-    - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8 8.1-nginx-swoole-oci8
-    - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8-prod 8.1-nginx-swoole-oci8-prod
-    - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8-prod 8.1-nginx-swoole-oci8-prod
+    - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8 8.1-swoole-nginx-oci8
+    - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8-prod 8.1-swoole-nginx-oci8-prod
+    - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8-prod 8.1-swoole-nginx-oci8-prod
     - docker build --pull -t kooldev/php:8.2-nginx-oci8 8.2-nginx-oci8
     - docker build --pull -t kooldev/php:8.2-nginx-oci8-prod 8.2-nginx-oci8-prod
-    - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8 8.2-nginx-swoole-oci8
-    - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8-prod 8.2-nginx-swoole-oci8-prod
-    - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8-prod 8.2-nginx-swoole-oci8-prod
+    - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8 8.2-swoole-nginx-oci8
+    - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8-prod 8.2-swoole-nginx-oci8-prod
+    - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8-prod 8.2-swoole-nginx-oci8-prod
     - docker build --pull -t kooldev/php:8.3-nginx-oci8 8.3-nginx-oci8
     - docker build --pull -t kooldev/php:8.3-nginx-oci8-prod 8.3-nginx-oci8-prod
-    - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8 8.3-nginx-swoole-oci8
-    - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8-prod 8.3-nginx-swoole-oci8-prod
-    - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8-prod 8.3-nginx-swoole-oci8-prod
+    - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8 8.3-swoole-nginx-oci8
+    - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8-prod 8.3-swoole-nginx-oci8-prod
+    - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8-prod 8.3-swoole-nginx-oci8-prod