diff --git a/.azure_templates/t-extend-database-build.yml b/.azure_templates/t-extend-database-build.yml
index 4f3c02c..dccbca1 100644
--- a/.azure_templates/t-extend-database-build.yml
+++ b/.azure_templates/t-extend-database-build.yml
@@ -54,15 +54,15 @@ steps:
     addBaseImageData: false
                
 - ${{ each trg_db in parameters.targetDatabases }}:
-  - bash: |
-      # download Oracle Database docker image from private repo and start the DB
-      time docker pull ${{ parameters.dockerRepo }}:${{ trg_db.oracleVersion }}
-      # start the docker container (DB)
-      time docker run -d --name ${{ trg_db.oracleVersion }} ${{ trg_db.dockerOptions }} -p 1521:${{ trg_db.dockerPortMap }} ${{ parameters.dockerRepo }}:${{ trg_db.oracleVersion }}
-      # Wait for DB startup
-      time docker logs -f ${{ trg_db.oracleVersion }} | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
-    displayName: 'Start Oracle DB Docker container: ${{ trg_db.oracleVersion }}'
-                
+  - template: t-task-extend-create-docker-database.yml
+    parameters:
+      containerRegistry: ${{ parameters.containerRegistry }}
+      dockerRepo: ${{ parameters.dockerRepo }}
+      dbname: ${{ trg_db.oracleVersion }}
+      oracleVersion: ${{ trg_db.oracleVersion }}
+      dockerOptions: ${{ trg_db.dockerOptions }}
+      dockerPortMap: ${{ trg_db.dockerPortMap }}
+
   - ${{ each script in trg_db.scripts }}:
     - template: t-task-extend-sqlcl.yml
       parameters:
diff --git a/.azure_templates/t-task-extend-create-docker-database.yml b/.azure_templates/t-task-extend-create-docker-database.yml
index c06ee10..f581bd5 100644
--- a/.azure_templates/t-task-extend-create-docker-database.yml
+++ b/.azure_templates/t-task-extend-create-docker-database.yml
@@ -28,6 +28,7 @@ steps:
                         ${{ parameters.dockerOptions }} \
                         -p 1521:${{ parameters.dockerPortMap }} \
                         --network utplsql_network \
+                        -e "ORACLE_PASSWORD=oracle" \
                         ${{ parameters.dockerRepo }}:${{ parameters.oracleVersion }}
         # Wait for DB startup
         time docker logs -f ${{ parameters.dbname }} | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
diff --git a/.azure_templates/t-task-extend-flyway.yml b/.azure_templates/t-task-extend-flyway.yml
index c86f2f4..5fd302d 100644
--- a/.azure_templates/t-task-extend-flyway.yml
+++ b/.azure_templates/t-task-extend-flyway.yml
@@ -31,7 +31,7 @@ steps:
             -v ${{ parameters.config_dir }}:/flyway/conf \
             -v ${{ parameters.driver_dir }}:/flyway/drivers \
             --network utplsql_network \
-            flyway/flyway migrate \
+            flyway/flyway:8.5 migrate \
               -url=jdbc:oracle:thin:@${{ parameters.jdbcConnectionString }} \
               -configFiles="/flyway/conf/${{ parameters.config_file }}" \
               -user="${{ parameters.user }}" \
diff --git a/.azure_templates/t-task-extend-sqlcl-liquibase.yml b/.azure_templates/t-task-extend-sqlcl-liquibase.yml
index 24bf932..eebaee7 100644
--- a/.azure_templates/t-task-extend-sqlcl-liquibase.yml
+++ b/.azure_templates/t-task-extend-sqlcl-liquibase.yml
@@ -18,7 +18,7 @@ steps:
         #Issue with 19.3 docker images. fixed in 21
         sql ${{ parameters.user }}/${{ parameters.password }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true<<EOF
         lb version
-        lb update -debug -changelog ${{ parameters.masterchangelogfile }} 
+        lb update -debug -changelog-file ${{ parameters.masterchangelogfile }} 
         exit;
         EOF
         exit $?
diff --git a/.azure_templates/t-task-extend-utplsqlcli.yml b/.azure_templates/t-task-extend-utplsqlcli.yml
index 7b60f88..e55f9a1 100644
--- a/.azure_templates/t-task-extend-utplsqlcli.yml
+++ b/.azure_templates/t-task-extend-utplsqlcli.yml
@@ -19,7 +19,15 @@ steps:
         cd ${{ parameters.work_dir }}
         utplsql run ${{ parameters.test_user }}/${{ parameters.test_pwd }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true \
           -source_path=${{ parameters.source_path }} \
+          -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \
+          -owner_subexpression=4 \
+          -name_subexpression=5 \
+          -type_subexpression=6 \
           -test_path=${{ parameters.test_path }} \
+          -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \
+          -owner_subexpression=1 \
+          -type_subexpression=5 \
+          -name_subexpression=4 \
           -f=ut_documentation_reporter      -c \
           -f=ut_coverage_sonar_reporter     -o=coverage.xml \
           -f=ut_sonar_test_reporter         -o=test_results.xml \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 497f310..2c1f402 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        utplsql-version: [develop, v3.1.8, v3.1.11]
+        utplsql-version: [develop, v3.1.13]
 
     services:
       oracle:
@@ -45,7 +45,7 @@ jobs:
         run: echo Installing ${UTPLSQL_VERSION} && sh ${{ github.workspace }}/scripts/1_install_utplsql.sh
 
       - name: Install utPLSQL-cli
-        run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
+        run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/3.1.9/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
 
       - name: Install demo project
         run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh
diff --git a/scripts/1_install_utplsql.sh b/scripts/1_install_utplsql.sh
index 691ee88..041748e 100644
--- a/scripts/1_install_utplsql.sh
+++ b/scripts/1_install_utplsql.sh
@@ -1,4 +1,4 @@
 git clone --depth=1 --branch=${UTPLSQL_VERSION} https://github.com/utPLSQL/utPLSQL.git utPLSQL
 chmod -R go+w $(pwd)/utPLSQL/source
 docker run --rm -v $(pwd)/utPLSQL:/utPLSQL -w /utPLSQL/source --network host \
-    --entrypoint sqlplus gvenzl/oracle-xe:18-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users
+    --entrypoint sqlplus gvenzl/oracle-xe:21-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users
diff --git a/scripts/2_install_demo_project.sh b/scripts/2_install_demo_project.sh
index c0f5da1..73de8c7 100644
--- a/scripts/2_install_demo_project.sh
+++ b/scripts/2_install_demo_project.sh
@@ -1,7 +1,7 @@
 docker run --rm -v $(pwd):/work -w /work/  --network host \
-    --entrypoint sqlplus gvenzl/oracle-xe:18-slim \
+    --entrypoint sqlplus gvenzl/oracle-xe:21-slim \
     sys/oracle@//127.0.0.1:1521/XE as sysdba @source/create_user.sql
 
 docker run --rm -v $(pwd):/work -w /work/  --network host \
-    --entrypoint sqlplus gvenzl/oracle-xe:18-slim \
+    --entrypoint sqlplus gvenzl/oracle-xe:21-slim \
     ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/install.sql
diff --git a/scripts/3_install_tests.sh b/scripts/3_install_tests.sh
index e3bf4e5..99f305d 100644
--- a/scripts/3_install_tests.sh
+++ b/scripts/3_install_tests.sh
@@ -1,3 +1,3 @@
 docker run --rm -v $(pwd):/work -w /work/  --network host \
-    --entrypoint sqlplus gvenzl/oracle-xe:18-slim \
+    --entrypoint sqlplus gvenzl/oracle-xe:21-slim \
     ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/install.sql
diff --git a/scripts/4_run_tests.sh b/scripts/4_run_tests.sh
index 4e89642..59e9289 100644
--- a/scripts/4_run_tests.sh
+++ b/scripts/4_run_tests.sh
@@ -2,10 +2,18 @@
 
 set -ev
 
-utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE \
-  -source_path=source -test_path=test \
+utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE?oracle.net.disableOob=true \
+  -source_path=source -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \
+  -owner_subexpression=4 \
+  -name_subexpression=5 \
+  -type_subexpression=6 \
+  -test_path=test -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \
+  -owner_subexpression=1 \
+  -type_subexpression=5 \
+  -name_subexpression=4 \
   -f=ut_documentation_reporter  -c \
-  -f=ut_coverage_sonar_reporter -o=coverage.xml \
-  -f=ut_sonar_test_reporter     -o=test_results.xml \
-  --failure-exit-code=0
-
+  -f=ut_coverage_sonar_reporter     -o=coverage.xml \
+  -f=ut_sonar_test_reporter         -o=test_results.xml \
+  -f=ut_coverage_cobertura_reporter -o=cobertura.xml \
+  -f=ut_junit_reporter              -o=junit_test_results.xml \
+  --failure-exit-code=0
\ No newline at end of file
diff --git a/source/award_bonus/R__award_bonus.prc b/source/award_bonus/R__ut3_demo.award_bonus.prc
similarity index 100%
rename from source/award_bonus/R__award_bonus.prc
rename to source/award_bonus/R__ut3_demo.award_bonus.prc
diff --git a/source/award_bonus/award_bonus.xml b/source/award_bonus/award_bonus.xml
index 865bd10..926f36f 100644
--- a/source/award_bonus/award_bonus.xml
+++ b/source/award_bonus/award_bonus.xml
@@ -16,7 +16,7 @@
     <changeSet author="utplsql" id="02_award_bonus_prc" runOnChange="true">
       <sqlFile dbms="oracle"
                endDelimiter=";"
-               path="R__award_bonus.prc"
+               path="R__ut3_demo.award_bonus.prc"
                relativeToChangelogFile="true"
                splitStatements="false"
                stripComments="false"/>
diff --git a/source/between_string/R__betwnstr.fnc b/source/between_string/R__ut3_demo.betwnstr.fnc
similarity index 100%
rename from source/between_string/R__betwnstr.fnc
rename to source/between_string/R__ut3_demo.betwnstr.fnc
diff --git a/source/between_string/between_string.xml b/source/between_string/between_string.xml
index 238cd58..0c40237 100644
--- a/source/between_string/between_string.xml
+++ b/source/between_string/between_string.xml
@@ -8,7 +8,7 @@
     <changeSet author="utplsql" id="05_between_string" runOnChange="true">
       <sqlFile dbms="oracle"
                endDelimiter=";"
-               path="R__betwnstr.fnc"
+               path="R__ut3_demo.betwnstr.fnc"
                relativeToChangelogFile="true"
                splitStatements="false"
                stripComments="false"/>
diff --git a/source/install.sql b/source/install.sql
index 1ce808f..c20e15a 100644
--- a/source/install.sql
+++ b/source/install.sql
@@ -1,6 +1,6 @@
 @source/award_bonus/V1.01__employees_test.sql
-@source/award_bonus/R__award_bonus.prc
-@source/between_string/R__betwnstr.fnc
+@source/award_bonus/R__ut3_demo.award_bonus.prc
+@source/between_string/R__ut3_demo.betwnstr.fnc
 @source/remove_rooms_by_name/V1.02__rooms.sql
-@source/remove_rooms_by_name/R__remove_rooms_by_name.prc
+@source/remove_rooms_by_name/R__ut3_demo.remove_rooms_by_name.prc
 exit
\ No newline at end of file
diff --git a/source/remove_rooms_by_name/R__remove_rooms_by_name.prc b/source/remove_rooms_by_name/R__ut3_demo.remove_rooms_by_name.prc
similarity index 100%
rename from source/remove_rooms_by_name/R__remove_rooms_by_name.prc
rename to source/remove_rooms_by_name/R__ut3_demo.remove_rooms_by_name.prc
diff --git a/source/remove_rooms_by_name/remove_rooms_by_name.xml b/source/remove_rooms_by_name/remove_rooms_by_name.xml
index 6d9a4c3..351fa71 100644
--- a/source/remove_rooms_by_name/remove_rooms_by_name.xml
+++ b/source/remove_rooms_by_name/remove_rooms_by_name.xml
@@ -16,7 +16,7 @@
     <changeSet author="utplsql" id="04_remove_rooms_by_name_prc" runOnChange="true">
       <sqlFile dbms="oracle"
                endDelimiter=";"
-               path="R__remove_rooms_by_name.prc"
+               path="R__ut3_demo.remove_rooms_by_name.prc"
                relativeToChangelogFile="true"
                splitStatements="false"
                stripComments="false"/>
diff --git a/test/award_bonus/test_award_bonus.pkb b/test/award_bonus/ut3_demo.test_award_bonus.pkb
similarity index 100%
rename from test/award_bonus/test_award_bonus.pkb
rename to test/award_bonus/ut3_demo.test_award_bonus.pkb
diff --git a/test/award_bonus/test_award_bonus.pks b/test/award_bonus/ut3_demo.test_award_bonus.pks
similarity index 100%
rename from test/award_bonus/test_award_bonus.pks
rename to test/award_bonus/ut3_demo.test_award_bonus.pks
diff --git a/test/between_string/test_betwnstr.pkb b/test/between_string/ut3_demo.test_betwnstr.pkb
similarity index 100%
rename from test/between_string/test_betwnstr.pkb
rename to test/between_string/ut3_demo.test_betwnstr.pkb
diff --git a/test/between_string/test_betwnstr.pks b/test/between_string/ut3_demo.test_betwnstr.pks
similarity index 100%
rename from test/between_string/test_betwnstr.pks
rename to test/between_string/ut3_demo.test_betwnstr.pks
diff --git a/test/install.sql b/test/install.sql
index 0373f3f..9e43716 100644
--- a/test/install.sql
+++ b/test/install.sql
@@ -1,10 +1,10 @@
-@test/award_bonus/test_award_bonus.pks
-@test/award_bonus/test_award_bonus.pkb
+@test/award_bonus/ut3_demo.test_award_bonus.pks
+@test/award_bonus/ut3_demo.test_award_bonus.pkb
 show errors
-@test/between_string/test_betwnstr.pks
-@test/between_string/test_betwnstr.pkb
+@test/between_string/ut3_demo.test_betwnstr.pks
+@test/between_string/ut3_demo.test_betwnstr.pkb
 show errors
-@test/remove_rooms_by_name/test_remove_rooms_by_name.pks
-@test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
+@test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pks
+@test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pkb
 show errors
 exit
\ No newline at end of file
diff --git a/test/remove_rooms_by_name/test_remove_rooms_by_name.pkb b/test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pkb
similarity index 100%
rename from test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
rename to test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pkb
diff --git a/test/remove_rooms_by_name/test_remove_rooms_by_name.pks b/test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pks
similarity index 100%
rename from test/remove_rooms_by_name/test_remove_rooms_by_name.pks
rename to test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pks
diff --git a/utlplsql-demo-project.yml b/utlplsql-demo-project.yml
index dbf7a74..604af54 100644
--- a/utlplsql-demo-project.yml
+++ b/utlplsql-demo-project.yml
@@ -9,8 +9,8 @@ variables:
   SQLCL_DIR: $(Build.BinariesDirectory)/sqlcl
   UTPLSQL_DIR: $(Build.BinariesDirectory)/utPLSQL
   UTPLSQL_CLI_DIR: $(Build.BinariesDirectory)/utPLSQL-cli
-  UTPLSQL_CLI_VERSION: 'v3.1.8'
-  UTPLSQL_VERSION: 'v3.1.11' 
+  UTPLSQL_CLI_VERSION: '3.1.9'
+  UTPLSQL_VERSION: 'v3.1.13' 
   DOCKHER_HUB_REPO: 'gvenzl/oracle-xe'
   DB_USER: ut3_demo
   DB_PASS: ut3_demo  
@@ -20,8 +20,8 @@ jobs:
   displayName: Build utPLSQL-demo-project
   strategy:
     matrix:
-      Oracle19_2:
-        ORACLE_VERSION: "19c-se2-small"
+      Oracle21_slim:
+        ORACLE_VERSION: "21-slim"
     maxParallel: 2
 
   steps:
diff --git a/utplsql-cicd-flyway-demo.yml b/utplsql-cicd-flyway-demo.yml
index 78cc4f5..b086bb1 100644
--- a/utplsql-cicd-flyway-demo.yml
+++ b/utplsql-cicd-flyway-demo.yml
@@ -14,9 +14,9 @@ variables:
   - name : UTPLSQL_CLI_DIR
     value: $(Build.BinariesDirectory)/utPLSQL-cli
   - name : UTPLSQL_CLI_VERSION
-    value:  'v3.1.8'
+    value:  '3.1.9'
   - name : UTPLSQL_VERSION
-    value:  'v3.1.11' 
+    value:  'v3.1.13' 
   - name : DB_USER
     value:  ut3_demo
   - name : DB_PASS
diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml
index 3e9e5ee..e92727e 100644
--- a/utplsql-cicd-liquibase-demo.yml
+++ b/utplsql-cicd-liquibase-demo.yml
@@ -14,9 +14,9 @@ variables:
   - name : UTPLSQL_CLI_DIR
     value: $(Build.BinariesDirectory)/utPLSQL-cli
   - name : UTPLSQL_CLI_VERSION
-    value:  'v3.1.8'
+    value:  '3.1.9'
   - name : UTPLSQL_VERSION
-    value:  'v3.1.11' 
+    value:  'v3.1.13' 
   - name : DB_USER
     value:  ut3_demo
   - name : DB_PASS