diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml
index 621b18532e0..4e1a03dd58c 100644
--- a/.github/actions/apt-x64/action.yml
+++ b/.github/actions/apt-x64/action.yml
@@ -59,15 +59,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 7ac2ae4c4fc..576357b94f1 100644
--- a/.github/actions/install-linux/action.yml
+++ b/.github/actions/install-linux/action.yml
@@ -6,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
-        echo extension=oci8.so    > /etc/php.d/oci8.ini
-        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 83fe2925916..61371fa3d08 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -564,7 +564,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