diff --git a/.github/workflows/main-5.4.yml b/.github/workflows/main-5.4.yml
new file mode 100644
index 0000000..c10412b
--- /dev/null
+++ b/.github/workflows/main-5.4.yml
@@ -0,0 +1,64 @@
+# This workflow will build a Java project with Ant
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant
+
+name: Java CI - 5.4
+
+on: [push, pull_request,workflow_dispatch]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      luceeVersionQuery: 5.4/all/light
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: maven-cache
+    - name: Cache Lucee files
+      uses: actions/cache@v3
+      with:
+        path: _actions/lucee/script-runner/main/lucee-download-cache
+        key: lucee-downloads
+    - name: Set up MySQL (local)
+      run: |
+        sudo systemctl start mysql
+        mysql -e 'CREATE DATABASE lucee' -uroot -proot
+        mysql -e 'CREATE USER "lucee"@"localhost" IDENTIFIED WITH mysql_native_password BY "lucee";' -uroot -proot
+        mysql -e 'GRANT ALL PRIVILEGES ON lucee.* TO "lucee"@"localhost"' -uroot -proot
+
+    - name: Build extension-jdbc-mysql with Ant
+      run: ant -noinput -verbose -buildfile build.xml
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: mysql-lex
+        path: dist/*.lex
+    - name: Checkout Lucee
+      uses: actions/checkout@v3
+      with:
+        repository: lucee/lucee
+        path: lucee
+    - name: Run Lucee Test Suite, labels="mysql"
+      uses: lucee/script-runner@main
+      with:
+        webroot: ${{ github.workspace }}/lucee/test
+        execute: /bootstrap-tests.cfm
+        luceeVersion: ${{ env.luceeVersion }}
+        luceeVersionQuery: ${{ env.luceeVersionQuery }}
+        extensionDir: ${{ github.workspace }}/dist
+      env:
+        testLabels: mysql
+        MYSQL_SERVER: localhost
+        MYSQL_USERNAME: lucee
+        MYSQL_PASSWORD: lucee
+        MYSQL_PORT: 3306
+        MYSQL_DATABASE: lucee
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 040a837..4ab0a34 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,16 +4,15 @@
 name: Java CI
 
 on: [push, pull_request,workflow_dispatch]
- 
+
 jobs:
   build:
 
-    runs-on: ubuntu-latest   
+    runs-on: ubuntu-latest
     env:
-      luceeVersion: light-6.0.0.448-SNAPSHOT
-
+      luceeVersionQuery: 0/all/light
     steps:
-    - uses: actions/checkout@v3   
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
@@ -23,24 +22,19 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.m2
-        key: lucee-mysql
-        restore-keys: |
-          ${{ runner.os }}-m2
-          maven-cache
+        key: maven-cache
     - name: Cache Lucee files
       uses: actions/cache@v3
       with:
         path: _actions/lucee/script-runner/main/lucee-download-cache
-        key: lucee-downloads-${{ env.luceeVersion }}
-        restore-keys: |
-          lucee-downloads
+        key: lucee-downloads
     - name: Set up MySQL (local)
       run: |
         sudo systemctl start mysql
         mysql -e 'CREATE DATABASE lucee' -uroot -proot
         mysql -e 'CREATE USER "lucee"@"localhost" IDENTIFIED WITH mysql_native_password BY "lucee";' -uroot -proot
         mysql -e 'GRANT ALL PRIVILEGES ON lucee.* TO "lucee"@"localhost"' -uroot -proot
-         
+
     - name: Build extension-jdbc-mysql with Ant
       run: ant -noinput -verbose -buildfile build.xml
     - name: Upload Artifact
@@ -59,6 +53,7 @@ jobs:
         webroot: ${{ github.workspace }}/lucee/test
         execute: /bootstrap-tests.cfm
         luceeVersion: ${{ env.luceeVersion }}
+        luceeVersionQuery: ${{ env.luceeVersionQuery }}
         extensionDir: ${{ github.workspace }}/dist
       env:
         testLabels: mysql
diff --git a/build.xml b/build.xml
index a91435a..a6a75f9 100644
--- a/build.xml
+++ b/build.xml
@@ -140,11 +140,6 @@
     <delete dir="${dist}/"/>
   </target>
 
-
-
-
-
-
   <target name="dist" description="generate the distribution">
     
     <!-- jar -->
diff --git a/mysql-connector-j-8.0.33.jar b/mysql-connector-j-8.1.0.jar
similarity index 84%
rename from mysql-connector-j-8.0.33.jar
rename to mysql-connector-j-8.1.0.jar
index 3f741f5..9e38a71 100644
Binary files a/mysql-connector-j-8.0.33.jar and b/mysql-connector-j-8.1.0.jar differ