diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index fd0efa0..37cc551 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: ['7.4', '8.0', '8.1']
+        version: ['8.0', '8.1', '8.2', '8.3']
 
     steps:
       - name: Checkout code
@@ -19,28 +19,22 @@ jobs:
 
       - name: Build
         run: |
-          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 }}-oci8-nginx ${{ matrix.version }}-oci8-nginx
+          docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-nginx-prod ${{ matrix.version }}-oci8-nginx-prod
 
-      - name: Build Swoole
-        if: matrix.version != '7.4'
-        run: |
-          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 }}-oci8-swoole-nginx ${{ matrix.version }}-oci8-swoole-nginx
+          docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod ${{ matrix.version }}-oci8-swoole-nginx-prod
 
       - name: Tests
         run: |
-          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 }}-oci8-nginx php -r "extension_loaded('oci8') or die(1);"
+          docker run kooldev/php:${{ matrix.version }}-oci8-nginx-prod php -r "extension_loaded('oci8') or die(1);"
 
-      - name: Tests Swoole
-        if: matrix.version != '7.4'
-        run: |
-          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 }}-oci8-nginx php -r "extension_loaded('oci8') or die(1);"
+          docker run kooldev/php:${{ matrix.version }}-oci8-nginx-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 }}-oci8-swoole-nginx php -r "extension_loaded('oci8') or die(1);"
+          docker run kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod php -r "extension_loaded('oci8') or die(1);"
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
@@ -52,11 +46,8 @@ jobs:
       - name: Push to DockerHub
         if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8'
         run: |
-          docker push kooldev/php:${{ matrix.version }}-nginx-oci8
-          docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod
+          docker push kooldev/php:${{ matrix.version }}-oci8-nginx
+          docker push kooldev/php:${{ matrix.version }}-oci8-nginx-prod
 
-      - name: Push to DockerHub Swoole
-        if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8' && matrix.version != '7.4'
-        run: |
-          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 }}-oci8-swoole-nginx
+          docker push kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod
diff --git a/8.0-nginx-oci8-prod/Dockerfile b/8.0-oci8-nginx-prod/Dockerfile
similarity index 100%
rename from 8.0-nginx-oci8-prod/Dockerfile
rename to 8.0-oci8-nginx-prod/Dockerfile
diff --git a/8.0-nginx-oci8/Dockerfile b/8.0-oci8-nginx/Dockerfile
similarity index 100%
rename from 8.0-nginx-oci8/Dockerfile
rename to 8.0-oci8-nginx/Dockerfile
diff --git a/8.0-nginx-swoole-oci8-prod/Dockerfile b/8.0-oci8-swoole-nginx-prod/Dockerfile
similarity index 96%
rename from 8.0-nginx-swoole-oci8-prod/Dockerfile
rename to 8.0-oci8-swoole-nginx-prod/Dockerfile
index 777d325..742a8aa 100644
--- a/8.0-nginx-swoole-oci8-prod/Dockerfile
+++ b/8.0-oci8-swoole-nginx-prod/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.0-nginx-swoole-prod
+FROM kooldev/php:8.0-swoole-nginx-prod
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/8.1-nginx-swoole-oci8/Dockerfile b/8.0-oci8-swoole-nginx/Dockerfile
similarity index 97%
rename from 8.1-nginx-swoole-oci8/Dockerfile
rename to 8.0-oci8-swoole-nginx/Dockerfile
index f51e8ca..0c0f8e9 100644
--- a/8.1-nginx-swoole-oci8/Dockerfile
+++ b/8.0-oci8-swoole-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.1-nginx-swoole
+FROM kooldev/php:8.0-swoole-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
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-oci8-prod/Dockerfile b/8.1-oci8-nginx-prod/Dockerfile
similarity index 100%
rename from 8.1-nginx-oci8-prod/Dockerfile
rename to 8.1-oci8-nginx-prod/Dockerfile
diff --git a/8.1-nginx-oci8/Dockerfile b/8.1-oci8-nginx/Dockerfile
similarity index 100%
rename from 8.1-nginx-oci8/Dockerfile
rename to 8.1-oci8-nginx/Dockerfile
diff --git a/8.1-oci8-swoole-nginx-prod/Dockerfile b/8.1-oci8-swoole-nginx-prod/Dockerfile
new file mode 100644
index 0000000..e19dc40
--- /dev/null
+++ b/8.1-oci8-swoole-nginx-prod/Dockerfile
@@ -0,0 +1,21 @@
+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.0-nginx-swoole-oci8/Dockerfile b/8.1-oci8-swoole-nginx/Dockerfile
similarity index 97%
rename from 8.0-nginx-swoole-oci8/Dockerfile
rename to 8.1-oci8-swoole-nginx/Dockerfile
index 8c9997a..9d23c6f 100644
--- a/8.0-nginx-swoole-oci8/Dockerfile
+++ b/8.1-oci8-swoole-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:8.0-nginx-swoole
+FROM kooldev/php:8.1-swoole-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/7.4-nginx-oci8-prod/Dockerfile b/8.2-oci8-nginx-prod/Dockerfile
similarity index 97%
rename from 7.4-nginx-oci8-prod/Dockerfile
rename to 8.2-oci8-nginx-prod/Dockerfile
index 5edd0f0..62303c4 100644
--- a/7.4-nginx-oci8-prod/Dockerfile
+++ b/8.2-oci8-nginx-prod/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:7.4-nginx-prod
+FROM kooldev/php:8.2-nginx-prod
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/7.4-nginx-oci8/Dockerfile b/8.2-oci8-nginx/Dockerfile
similarity index 97%
rename from 7.4-nginx-oci8/Dockerfile
rename to 8.2-oci8-nginx/Dockerfile
index 6f4d7e4..3afbecc 100644
--- a/7.4-nginx-oci8/Dockerfile
+++ b/8.2-oci8-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM kooldev/php:7.4-nginx
+FROM kooldev/php:8.2-nginx
 
 ENV LD_LIBRARY_PATH /usr/local/instantclient
 ENV ORACLE_HOME /usr/local/instantclient
diff --git a/8.2-oci8-swoole-nginx-prod/Dockerfile b/8.2-oci8-swoole-nginx-prod/Dockerfile
new file mode 100644
index 0000000..3ec5f63
--- /dev/null
+++ b/8.2-oci8-swoole-nginx-prod/Dockerfile
@@ -0,0 +1,21 @@
+FROM kooldev/php:8.2-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.2-oci8-swoole-nginx/Dockerfile b/8.2-oci8-swoole-nginx/Dockerfile
new file mode 100644
index 0000000..d8eff40
--- /dev/null
+++ b/8.2-oci8-swoole-nginx/Dockerfile
@@ -0,0 +1,21 @@
+FROM kooldev/php:8.2-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.3-oci8-nginx-prod/Dockerfile b/8.3-oci8-nginx-prod/Dockerfile
new file mode 100644
index 0000000..8b5bd46
--- /dev/null
+++ b/8.3-oci8-nginx-prod/Dockerfile
@@ -0,0 +1,21 @@
+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-oci8-nginx/Dockerfile b/8.3-oci8-nginx/Dockerfile
new file mode 100644
index 0000000..96e14d2
--- /dev/null
+++ b/8.3-oci8-nginx/Dockerfile
@@ -0,0 +1,21 @@
+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-oci8-swoole-nginx-prod/Dockerfile b/8.3-oci8-swoole-nginx-prod/Dockerfile
new file mode 100644
index 0000000..31df101
--- /dev/null
+++ b/8.3-oci8-swoole-nginx-prod/Dockerfile
@@ -0,0 +1,21 @@
+FROM kooldev/php:8.3-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.3-oci8-swoole-nginx/Dockerfile b/8.3-oci8-swoole-nginx/Dockerfile
new file mode 100644
index 0000000..6675afd
--- /dev/null
+++ b/8.3-oci8-swoole-nginx/Dockerfile
@@ -0,0 +1,21 @@
+FROM kooldev/php:8.3-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/README.md b/README.md
index 46465c7..aec89f7 100644
--- a/README.md
+++ b/README.md
@@ -6,27 +6,47 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
 
 ## Available Tags
 
+### 8.3
+
+- [8.3-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-nginx/Dockerfile)
+- [8.3-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-nginx-prod/Dockerfile)
+
+### 8.3 with Swoole
+
+- [8.3-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-swoole-nginx/Dockerfile)
+- [8.3-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-swoole-nginx-prod/Dockerfile)
+
+### 8.2
+
+- [8.2-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-nginx/Dockerfile)
+- [8.2-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-nginx-prod/Dockerfile)
+
+### 8.2 with Swoole
+
+- [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-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-oci8/Dockerfile)
-- [8.1-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-oci8-prod/Dockerfile)
+- [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-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-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-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-oci8/Dockerfile)
-- [8.0-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-oci8-prod/Dockerfile)
+- [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-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-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-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).
+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 cdf9076..8e995ee 100644
--- a/fwd-template.json
+++ b/fwd-template.json
@@ -2,9 +2,9 @@
     "output": ".",
     "builds": [
         {
-            "name": "7.4-nginx-oci8",
+            "name": "8.0-oci8-nginx-prod",
             "data": {
-                "from": "kooldev/php:7.4-nginx"
+                "from": "kooldev/php:8.0-nginx-prod"
             },
             "files": [
                 {
@@ -14,9 +14,9 @@
             ]
         },
         {
-            "name": "7.4-nginx-oci8-prod",
+            "name": "8.0-oci8-nginx",
             "data": {
-                "from": "kooldev/php:7.4-nginx-prod"
+                "from": "kooldev/php:8.0-nginx"
             },
             "files": [
                 {
@@ -26,9 +26,9 @@
             ]
         },
         {
-            "name": "8.0-nginx-oci8-prod",
+            "name": "8.0-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.0-nginx-prod"
+                "from": "kooldev/php:8.0-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -38,9 +38,9 @@
             ]
         },
         {
-            "name": "8.0-nginx-oci8",
+            "name": "8.0-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.0-nginx"
+                "from": "kooldev/php:8.0-swoole-nginx"
             },
             "files": [
                 {
@@ -50,9 +50,9 @@
             ]
         },
         {
-            "name": "8.0-nginx-swoole-oci8-prod",
+            "name": "8.1-oci8-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.0-nginx-swoole-prod"
+                "from": "kooldev/php:8.1-nginx-prod"
             },
             "files": [
                 {
@@ -62,9 +62,9 @@
             ]
         },
         {
-            "name": "8.0-nginx-swoole-oci8",
+            "name": "8.1-oci8-nginx",
             "data": {
-                "from": "kooldev/php:8.0-nginx-swoole"
+                "from": "kooldev/php:8.1-nginx"
             },
             "files": [
                 {
@@ -74,9 +74,9 @@
             ]
         },
         {
-            "name": "8.1-nginx-oci8-prod",
+            "name": "8.1-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.1-nginx-prod"
+                "from": "kooldev/php:8.1-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -86,9 +86,81 @@
             ]
         },
         {
-            "name": "8.1-nginx-oci8",
+            "name": "8.1-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.1-nginx"
+                "from": "kooldev/php:8.1-swoole-nginx"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                }
+            ]
+        },
+        {
+            "name": "8.2-oci8-nginx-prod",
+            "data": {
+                "from": "kooldev/php:8.2-nginx-prod"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                }
+            ]
+        },
+        {
+            "name": "8.2-oci8-nginx",
+            "data": {
+                "from": "kooldev/php:8.2-nginx"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                }
+            ]
+        },
+        {
+            "name": "8.2-oci8-swoole-nginx-prod",
+            "data": {
+                "from": "kooldev/php:8.2-swoole-nginx-prod"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                }
+            ]
+        },
+        {
+            "name": "8.2-oci8-swoole-nginx",
+            "data": {
+                "from": "kooldev/php:8.2-swoole-nginx"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                }
+            ]
+        },
+        {
+            "name": "8.3-oci8-nginx-prod",
+            "data": {
+                "from": "kooldev/php:8.3-nginx-prod"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile"
+                }
+            ]
+        },
+        {
+            "name": "8.3-oci8-nginx",
+            "data": {
+                "from": "kooldev/php:8.3-nginx"
             },
             "files": [
                 {
@@ -98,9 +170,9 @@
             ]
         },
         {
-            "name": "8.1-nginx-swoole-oci8-prod",
+            "name": "8.3-oci8-swoole-nginx-prod",
             "data": {
-                "from": "kooldev/php:8.1-nginx-swoole-prod"
+                "from": "kooldev/php:8.3-swoole-nginx-prod"
             },
             "files": [
                 {
@@ -110,9 +182,9 @@
             ]
         },
         {
-            "name": "8.1-nginx-swoole-oci8",
+            "name": "8.3-oci8-swoole-nginx",
             "data": {
-                "from": "kooldev/php:8.1-nginx-swoole"
+                "from": "kooldev/php:8.3-swoole-nginx"
             },
             "files": [
                 {
diff --git a/kool.yml b/kool.yml
index ff0668d..2a2fa0a 100644
--- a/kool.yml
+++ b/kool.yml
@@ -3,13 +3,22 @@ scripts:
     - kool docker fireworkweb/fwd:v1.0 fwd template
   build:
     - kool run template
-    - docker build --pull -t kooldev/php:7.4-nginx-oci8 7.4-nginx-oci8
-    - docker build --pull -t kooldev/php:7.4-nginx-oci8-prod 7.4-nginx-oci8-prod
-    - 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.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.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
+    - docker build --pull -t kooldev/php:8.2-oci8-swoole-nginx-prod 8.2-oci8-swoole-nginx-prod
+    - docker build --pull -t kooldev/php:8.2-oci8-swoole-nginx-prod 8.2-oci8-swoole-nginx-prod
+    - docker build --pull -t kooldev/php:8.3-oci8-nginx 8.3-oci8-nginx
+    - docker build --pull -t kooldev/php:8.3-oci8-nginx-prod 8.3-oci8-nginx-prod
+    - 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