diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06350b10ca61..f2490cbbf14c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,10 +153,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          #- rdbms: autonomous-transaction-processing-serverless
+          #- rdbms: autonomous-transaction-processing-serverless-26ai
+          #- rdbms: autonomous-transaction-processing-serverless-19c
           - rdbms: base-database-service-19c
           - rdbms: base-database-service-21c
-          - rdbms: base-database-service-23ai
+          - rdbms: base-database-service-26ai
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -210,7 +211,7 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
 
       - id: create_database
-        uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
+        uses: loiclefevre/test@a802f8bb53b42b16c253d75f86b06360d150c6e4 # v1.0.22
         with:
           oci-service: ${{ matrix.rdbms }}
           action: create
@@ -231,7 +232,7 @@ jobs:
         run: ./ci/build-github.sh
         shell: bash
 
-      - uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
+      - uses: loiclefevre/test@a802f8bb53b42b16c253d75f86b06360d150c6e4 # v1.0.22
         if: always()
         with:
           oci-service: ${{ matrix.rdbms }}
@@ -345,4 +346,4 @@ jobs:
           path: |
             ./**/target/reports/tests/
       - name: Omit produced artifacts from build cache
-        run: ./ci/before-cache.sh
+        run: ./ci/before-cache.sh
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 3e9e54553baf..8598aec5e487 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -53,7 +53,7 @@ elif [ "$RDBMS" == "oracle_db23c" ]; then
   export SERVICE=$(echo $INFO | jq -r '.database' | jq -r '.service')
   goal="-Pdb=oracle_cloud_db23c -DrunID=$RUNID -DdbHost=$HOST -DdbService=$SERVICE"
 # OTP
-elif [ "$RDBMS" == "autonomous-transaction-processing-serverless" ] || [ "$RDBMS" == "base-database-service-19c" ] || [ "$RDBMS" == "base-database-service-21c" ] || [ "$RDBMS" == "base-database-service-23ai" ]; then
+elif [ "$RDBMS" == "autonomous-transaction-processing-serverless-19c" ] || [ "$RDBMS" == "autonomous-transaction-processing-serverless-26ai" ] || [ "$RDBMS" == "autonomous-transaction-processing-serverless" ] || [ "$RDBMS" == "base-database-service-19c" ] || [ "$RDBMS" == "base-database-service-21c" ] || [ "$RDBMS" == "base-database-service-26ai" ]; then
   echo "Managing OTP Database..."
   goal="-Pdb=oracle_test_pilot_database -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
 elif [ "$RDBMS" == "db2" ] || [ "$RDBMS" == "db2_11_5" ]; then