diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index c622012d..aee92346 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -39,17 +39,19 @@ jobs:
           --health-timeout=5s
           --health-retries=5
 
-      # oracle:
-      #   image: gvenzl/oracle-xe:21.3.0-slim
-      #   ports:
-      #     - 1521:1521
-      #   env:
-      #     ORACLE_PASSWORD: testpass
-      #   options: >-
-      #     --health-cmd "echo 'exit' | sqlplus -L system/oracle@localhost/XEPDB1"
-      #     --health-interval=25s
-      #     --health-timeout=20s
-      #     --health-retries=20
+      oracle:
+        image: gvenzl/oracle-free:latest
+        ports:
+          - 1521:1521
+        env:
+          ORACLE_RANDOM_PASSWORD: true
+          APP_USER: test
+          APP_USER_PASSWORD: test
+        options: >-
+          --health-cmd healthcheck.sh
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
 
       mysql:
         image: mysql:8.0
@@ -81,20 +83,6 @@ jobs:
         sudo ACCEPT_EULA=Y apt-get install -y mssql-tools unixodbc-dev
         echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
         source ~/.bashrc
-    # - name: Download and install Oracle SQLcl
-    #   run: |
-    #     curl -L -o sqlcl.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip
-    #     unzip sqlcl.zip -d sqlcl
-    #     echo "$PWD/sqlcl/sqlcl/bin" >> $GITHUB_PATH
-    # - name: Run SQL script with Oracle SQLcl
-    #   run: |
-    #     echo "create user test identified by test;" > setup.sql
-    #     echo "grant connect, resource to test;" >> setup.sql
-    #     sql /nolog <<EOF
-    #     connect system/testpass@//localhost:1521/XEPDB1
-    #     @setup.sql
-    #     exit
-    #     EOF
     - name: Create SQLServer database
       run: |
         /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'YourStrong@Passw0rd' -Q "CREATE DATABASE [Whatever];"
diff --git a/.github/workflows/dotnetpull.yml b/.github/workflows/dotnetpull.yml
index 91ff3b53..a82ca52f 100644
--- a/.github/workflows/dotnetpull.yml
+++ b/.github/workflows/dotnetpull.yml
@@ -37,17 +37,19 @@ jobs:
           --health-timeout=5s
           --health-retries=5
 
-      # oracle:
-      #   image: gvenzl/oracle-xe:21.3.0-slim
-      #   ports:
-      #     - 1521:1521
-      #   env:
-      #     ORACLE_PASSWORD: testpass
-      #   options: >-
-      #     --health-cmd "echo 'exit' | sqlplus -L system/oracle@localhost/XEPDB1"
-      #     --health-interval=25s
-      #     --health-timeout=20s
-      #     --health-retries=20
+      oracle:
+        image: gvenzl/oracle-free:latest
+        ports:
+          - 1521:1521
+        env:
+          ORACLE_RANDOM_PASSWORD: true
+          APP_USER: test
+          APP_USER_PASSWORD: test
+        options: >-
+          --health-cmd healthcheck.sh
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
 
       mysql:
         image: mysql:8.0
@@ -79,20 +81,6 @@ jobs:
         sudo ACCEPT_EULA=Y apt-get install -y mssql-tools unixodbc-dev
         echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
         source ~/.bashrc
-    # - name: Download and install Oracle SQLcl
-    #   run: |
-    #     curl -L -o sqlcl.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip
-    #     unzip sqlcl.zip -d sqlcl
-    #     echo "$PWD/sqlcl/sqlcl/bin" >> $GITHUB_PATH
-    # - name: Run SQL script with Oracle SQLcl
-    #   run: |
-    #     echo "create user test identified by test;" > setup.sql
-    #     echo "grant connect, resource to test;" >> setup.sql
-    #     sql /nolog <<EOF
-    #     connect system/testpass@//localhost:1521/XEPDB1
-    #     @setup.sql
-    #     exit
-    #     EOF
     - name: Create SQLServer database
       run: |
         /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'YourStrong@Passw0rd' -Q "CREATE DATABASE [Whatever];"
diff --git a/src/Migrator.Tests/appsettings.json b/src/Migrator.Tests/appsettings.json
index 3cce2f41..a5ab1369 100644
--- a/src/Migrator.Tests/appsettings.json
+++ b/src/Migrator.Tests/appsettings.json
@@ -12,10 +12,10 @@
       "Id": "PostgreSQL",
       "ConnectionString": "Server=localhost;Port=5432;Database=testdb;User Id=testuser;Password=testpass;"
     },
-    //{
-    //  "Id": "Oracle",
-    //  "ConnectionString": "Data Source=//localhost:1521/XEPDB1;User Id=test;Password=test;"
-    //},
+    {
+      "Id": "Oracle",
+      "ConnectionString": "Data Source=//localhost:1521/FREEPDB1;User Id=test;Password=test;"
+    },
     {
       "Id": "MySQL",
       "ConnectionString": "Server=127.0.0.1;Port=3306;Database=testdb;User Id=testuser;Password=testpass;"