diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml
index 704388fee8c..72bc3b3673b 100644
--- a/.github/actions/apt-x64/action.yml
+++ b/.github/actions/apt-x64/action.yml
@@ -60,15 +60,3 @@ runs:
           libjpeg-dev \
           libpng-dev \
           libfreetype6-dev
-
-        mkdir /opt/oracle
-        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
-        unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
-        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
-        unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
-        mv instantclient_*_* /opt/oracle/instantclient
-        # interferes with libldap2 headers
-        rm /opt/oracle/instantclient/sdk/include/ldap.h
-        # fix debug build warning: zend_signal: handler was replaced for signal (2) after startup
-        echo DISABLE_INTERRUPT=on > /opt/oracle/instantclient/network/admin/sqlnet.ora
-        sudo sh -c 'echo /opt/oracle/instantclient >/etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig'
diff --git a/.github/actions/install-linux-x32/action.yml b/.github/actions/install-linux-x32/action.yml
index bf5f09cd779..4ef87ee03fd 100644
--- a/.github/actions/install-linux-x32/action.yml
+++ b/.github/actions/install-linux-x32/action.yml
@@ -6,7 +6,7 @@ runs:
       run: |
         set -x
         make install
-        mkdir /etc/php.d
+        mkdir -p /etc/php.d
         chmod 777 /etc/php.d
         echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
diff --git a/.github/actions/install-linux/action.yml b/.github/actions/install-linux/action.yml
index d2f7ea23b2e..576357b94f1 100644
--- a/.github/actions/install-linux/action.yml
+++ b/.github/actions/install-linux/action.yml
@@ -1,8 +1,4 @@
 name: Install
-inputs:
-  withOci:
-    default: true
-    required: false
 runs:
   using: composite
   steps:
@@ -10,9 +6,7 @@ runs:
       run: |
         set -x
         sudo make install
-        sudo mkdir     /etc/php.d
+        sudo mkdir -p /etc/php.d
         sudo chmod 777 /etc/php.d
         echo mysqli.default_socket=/var/run/mysqld/mysqld.sock    > /etc/php.d/mysqli.ini
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
-        ${{ inputs.withOci == 'true' && 'echo extension=oci8.so > /etc/php.d/oci8.ini' || '' }}
-        ${{ inputs.withOci == 'true' && 'echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini' || '' }}
diff --git a/.github/actions/setup-oracle/action.yml b/.github/actions/setup-oracle/action.yml
index 11c16fe93d5..1208e93a248 100644
--- a/.github/actions/setup-oracle/action.yml
+++ b/.github/actions/setup-oracle/action.yml
@@ -11,3 +11,20 @@ runs:
           --name oracle \
           -h oracle \
           -d gvenzl/oracle-xe:slim
+
+        mkdir /opt/oracle
+        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
+        unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
+        wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
+        unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
+        mv instantclient_*_* /opt/oracle/instantclient
+        # interferes with libldap2 headers
+        rm /opt/oracle/instantclient/sdk/include/ldap.h
+        # fix debug build warning: zend_signal: handler was replaced for signal (2) after startup
+        echo DISABLE_INTERRUPT=on > /opt/oracle/instantclient/network/admin/sqlnet.ora
+        sudo sh -c 'echo /opt/oracle/instantclient >/etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig'
+
+        sudo mkdir -p /etc/php.d
+        sudo chmod 777 /etc/php.d
+        echo extension=oci8.so > /etc/php.d/oci8.ini
+        echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 31261d5a5ef..abd0ac01c67 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -638,7 +638,7 @@ jobs:
       - name: make install
         run: |
           sudo make install
-          sudo mkdir     /etc/php.d
+          sudo mkdir -p /etc/php.d
           sudo chmod 777 /etc/php.d
           echo mysqli.default_socket=/var/run/mysqld/mysqld.sock    > /etc/php.d/mysqli.ini
           echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8481b10a5e3..f2f44dc23a5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -61,6 +61,7 @@ jobs:
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
       - name: Create Oracle container
+        if: ${{ !matrix.asan }}
         uses: ./.github/actions/setup-oracle
       - name: Setup Caddy server
         uses: ./.github/actions/setup-caddy
@@ -86,8 +87,6 @@ jobs:
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
         uses: ./.github/actions/install-linux
-        with:
-          withOci: ${{ !matrix.asan }}
       - name: Setup
         uses: ./.github/actions/setup-x64
       - name: Test