diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml
index 4b25241..8f6908f 100644
--- a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml
+++ b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml
@@ -1,47 +1,51 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>it.fabioformosa.quartz-manager</groupId>
-    <artifactId>quartz-manager-parent</artifactId>
-    <version>3.0.2-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>quartz-manager-starter-persistence</artifactId>
-  
-  <name>Quartz Manager Starter Security</name>
-  <description>Persist quartz jobs into a database</description>
-  
-  <url>https://github.com/fabioformosa/quartz-manager</url>
-  <properties>
-    <main.basedir>${basedir}/../..</main.basedir>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <groupId>it.fabioformosa.quartz-manager</groupId>
-      <artifactId>quartz-manager-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.liquibase</groupId>
-      <artifactId>liquibase-core</artifactId>
-    </dependency>
-    <dependency>
-  	  <groupId>org.springframework.boot</groupId>
-  	  <artifactId>spring-boot-starter-data-jpa</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>it.fabioformosa.quartz-manager</groupId>
+    <artifactId>quartz-manager-parent</artifactId>
+    <version>3.0.2-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>quartz-manager-starter-persistence</artifactId>
+  
+  <name>Quartz Manager Starter Security</name>
+  <description>Persist quartz jobs into a database</description>
+  
+  <url>https://github.com/fabioformosa/quartz-manager</url>
+  <properties>
+    <main.basedir>${basedir}/../..</main.basedir>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <java.version>1.8</java.version>
+  </properties>
+  
+  <dependencies>
+    <dependency>
+      <groupId>it.fabioformosa.quartz-manager</groupId>
+      <artifactId>quartz-manager-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.liquibase</groupId>
+      <artifactId>liquibase-core</artifactId>
+    </dependency>
+    <dependency>
+  	  <groupId>org.springframework.boot</groupId>
+  	  <artifactId>spring-boot-starter-data-jpa</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
+</project>
diff --git a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml
index bfc2f24..371f02a 100644
--- a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml
+++ b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml
@@ -35,10 +35,10 @@
           <groupId>it.fabioformosa.quartz-manager</groupId>
           <artifactId>quartz-manager-starter-security</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--          <groupId>it.fabioformosa.quartz-manager</groupId>-->
-<!--          <artifactId>quartz-manager-starter-persistence</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+          <groupId>it.fabioformosa.quartz-manager</groupId>
+          <artifactId>quartz-manager-starter-persistence</artifactId>
+        </dependency>
   
         <!-- SPRING -->
 		<dependency>
@@ -49,10 +49,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-data-jpa</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -116,10 +116,10 @@
         </dependency>
         
         <!-- TO BE REMOVED -->
-        <dependency>
-          <groupId>org.liquibase</groupId>
-          <artifactId>liquibase-core</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--          <groupId>org.liquibase</groupId>-->
+<!--          <artifactId>liquibase-core</artifactId>-->
+<!--        </dependency>-->
         
 <!--        <dependency>-->
 <!--          <groupId>org.postgresql</groupId>-->
diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml
index 74a5d68..9f468cc 100644
--- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml
+++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml
@@ -12,22 +12,8 @@ spring:
     cache: false
     mode: LEGACYHTML5
   jpa.open-in-view: false
-#  liquibase:
-#    change-log: "classpath:db/liquibase-changelog-master.xml"
-#    contexts: default
-#    user: quartzmanager
-#    password: quartzmanager
-#  datasource:
-#    url: "jdbc:postgresql://localhost:5432/quartzmanager"
-#    username: quartzmanager
-#    password: quartzmanager
 
 #  quartz:
-#    job-store-type: jdbc
-#    initialize-schema: never
-#    properties:
-#      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-      
 #     org.quartz.jobStore.isClustered: true
 #     org.quartz.scheduler.instanceId=AUTO
 
@@ -47,12 +33,12 @@ logging:
     org.quartz: DEBUG
     
 quartz-manager:
-#  persistence:
-#  quartz:
-#    datasource:
-#      url: "jdbc:postgresql://localhost:5432/quartzmanager"
-#      user: "quartzmanager"
-#      password: "quartzmanager"
+  persistence:
+    quartz:
+      datasource:
+        url: "jdbc:postgresql://localhost:5432/quartzmanager"
+        user: "quartzmanager"
+        password: "quartzmanager"
   security:
     login-model:
       form-login-enabled: true
diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/db/liquibase-changelog-master.xml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/db/liquibase-changelog-master.xml
deleted file mode 100644
index ad7fc84..0000000
--- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/db/liquibase-changelog-master.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-    http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
-
-  <includeAll path="./migrations" relativeToChangelogFile="true"/>
-
-</databaseChangeLog>
diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/db/migrations/V202102190034_quartz_tables.sql b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/db/migrations/V202102190034_quartz_tables.sql
deleted file mode 100644
index 1fc9754..0000000
--- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/db/migrations/V202102190034_quartz_tables.sql
+++ /dev/null
@@ -1,218 +0,0 @@
---liquibase formatted sql
-
-/* https://github.com/quartz-scheduler/quartz/blob/master/quartz-core/src/main/resources/org/quartz/impl/jdbcjobstore/tables_postgres.sql */
-
---changeset V202102190034_01 (dbms:postgresql)
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-DROP TABLE IF EXISTS QRTZ_LOCKS;
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
-
---changeset V202102190034_02 (dbms:postgresql)
-CREATE TABLE QRTZ_JOB_DETAILS
-(
-  SCHED_NAME        VARCHAR(120) NOT NULL,
-  JOB_NAME          VARCHAR(200) NOT NULL,
-  JOB_GROUP         VARCHAR(200) NOT NULL,
-  DESCRIPTION       VARCHAR(250) NULL,
-  JOB_CLASS_NAME    VARCHAR(250) NOT NULL,
-  IS_DURABLE        BOOL         NOT NULL,
-  IS_NONCONCURRENT  BOOL         NOT NULL,
-  IS_UPDATE_DATA    BOOL         NOT NULL,
-  REQUESTS_RECOVERY BOOL         NOT NULL,
-  JOB_DATA          BYTEA        NULL,
-  PRIMARY KEY (SCHED_NAME, JOB_NAME, JOB_GROUP)
-);
-
---changeset V202102190034_03 (dbms:postgresql)
-CREATE TABLE QRTZ_TRIGGERS
-(
-  SCHED_NAME     VARCHAR(120) NOT NULL,
-  TRIGGER_NAME   VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP  VARCHAR(200) NOT NULL,
-  JOB_NAME       VARCHAR(200) NOT NULL,
-  JOB_GROUP      VARCHAR(200) NOT NULL,
-  DESCRIPTION    VARCHAR(250) NULL,
-  NEXT_FIRE_TIME BIGINT       NULL,
-  PREV_FIRE_TIME BIGINT       NULL,
-  PRIORITY       INTEGER      NULL,
-  TRIGGER_STATE  VARCHAR(16)  NOT NULL,
-  TRIGGER_TYPE   VARCHAR(8)   NOT NULL,
-  START_TIME     BIGINT       NOT NULL,
-  END_TIME       BIGINT       NULL,
-  CALENDAR_NAME  VARCHAR(200) NULL,
-  MISFIRE_INSTR  SMALLINT     NULL,
-  JOB_DATA       BYTEA        NULL,
-  PRIMARY KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME, JOB_NAME, JOB_GROUP)
-  REFERENCES QRTZ_JOB_DETAILS (SCHED_NAME, JOB_NAME, JOB_GROUP)
-);
-
---changeset V202102190034_04 (dbms:postgresql)
-CREATE TABLE QRTZ_SIMPLE_TRIGGERS
-(
-  SCHED_NAME      VARCHAR(120) NOT NULL,
-  TRIGGER_NAME    VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP   VARCHAR(200) NOT NULL,
-  REPEAT_COUNT    BIGINT       NOT NULL,
-  REPEAT_INTERVAL BIGINT       NOT NULL,
-  TIMES_TRIGGERED BIGINT       NOT NULL,
-  PRIMARY KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-);
-
---changeset V202102190034_05 (dbms:postgresql)
-CREATE TABLE QRTZ_CRON_TRIGGERS
-(
-  SCHED_NAME      VARCHAR(120) NOT NULL,
-  TRIGGER_NAME    VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP   VARCHAR(200) NOT NULL,
-  CRON_EXPRESSION VARCHAR(120) NOT NULL,
-  TIME_ZONE_ID    VARCHAR(80),
-  PRIMARY KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-);
-
---changeset V202102190034_06 (dbms:postgresql)
-CREATE TABLE QRTZ_SIMPROP_TRIGGERS
-(
-  SCHED_NAME    VARCHAR(120)   NOT NULL,
-  TRIGGER_NAME  VARCHAR(200)   NOT NULL,
-  TRIGGER_GROUP VARCHAR(200)   NOT NULL,
-  STR_PROP_1    VARCHAR(512)   NULL,
-  STR_PROP_2    VARCHAR(512)   NULL,
-  STR_PROP_3    VARCHAR(512)   NULL,
-  INT_PROP_1    INT            NULL,
-  INT_PROP_2    INT            NULL,
-  LONG_PROP_1   BIGINT         NULL,
-  LONG_PROP_2   BIGINT         NULL,
-  DEC_PROP_1    NUMERIC(13, 4) NULL,
-  DEC_PROP_2    NUMERIC(13, 4) NULL,
-  BOOL_PROP_1   BOOL           NULL,
-  BOOL_PROP_2   BOOL           NULL,
-  PRIMARY KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-);
-
---changeset V202102190034_07 (dbms:postgresql)
-CREATE TABLE QRTZ_BLOB_TRIGGERS
-(
-  SCHED_NAME    VARCHAR(120) NOT NULL,
-  TRIGGER_NAME  VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  BLOB_DATA     BYTEA        NULL,
-  PRIMARY KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP),
-  FOREIGN KEY (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-  REFERENCES QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP)
-);
-
---changeset V202102190034_08 (dbms:postgresql)
-CREATE TABLE QRTZ_CALENDARS
-(
-  SCHED_NAME    VARCHAR(120) NOT NULL,
-  CALENDAR_NAME VARCHAR(200) NOT NULL,
-  CALENDAR      BYTEA        NOT NULL,
-  PRIMARY KEY (SCHED_NAME, CALENDAR_NAME)
-);
-
---changeset V202102190034_09 (dbms:postgresql)
-CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS
-(
-  SCHED_NAME    VARCHAR(120) NOT NULL,
-  TRIGGER_GROUP VARCHAR(200) NOT NULL,
-  PRIMARY KEY (SCHED_NAME, TRIGGER_GROUP)
-);
-
---changeset V202102190034_10 (dbms:postgresql)
-CREATE TABLE QRTZ_FIRED_TRIGGERS
-(
-  SCHED_NAME        VARCHAR(120) NOT NULL,
-  ENTRY_ID          VARCHAR(95)  NOT NULL,
-  TRIGGER_NAME      VARCHAR(200) NOT NULL,
-  TRIGGER_GROUP     VARCHAR(200) NOT NULL,
-  INSTANCE_NAME     VARCHAR(200) NOT NULL,
-  FIRED_TIME        BIGINT       NOT NULL,
-  SCHED_TIME        BIGINT       NOT NULL,
-  PRIORITY          INTEGER      NOT NULL,
-  STATE             VARCHAR(16)  NOT NULL,
-  JOB_NAME          VARCHAR(200) NULL,
-  JOB_GROUP         VARCHAR(200) NULL,
-  IS_NONCONCURRENT  BOOL         NULL,
-  REQUESTS_RECOVERY BOOL         NULL,
-  PRIMARY KEY (SCHED_NAME, ENTRY_ID)
-);
-
---changeset V202102190034_11 (dbms:postgresql)
-CREATE TABLE QRTZ_SCHEDULER_STATE
-(
-  SCHED_NAME        VARCHAR(120) NOT NULL,
-  INSTANCE_NAME     VARCHAR(200) NOT NULL,
-  LAST_CHECKIN_TIME BIGINT       NOT NULL,
-  CHECKIN_INTERVAL  BIGINT       NOT NULL,
-  PRIMARY KEY (SCHED_NAME, INSTANCE_NAME)
-);
-
---changeset V202102190034_12 (dbms:postgresql)
-CREATE TABLE QRTZ_LOCKS
-(
-  SCHED_NAME VARCHAR(120) NOT NULL,
-  LOCK_NAME  VARCHAR(40)  NOT NULL,
-  PRIMARY KEY (SCHED_NAME, LOCK_NAME)
-);
-
---changeset V202102190034_13 (dbms:postgresql)
-CREATE INDEX IDX_QRTZ_J_REQ_RECOVERY
-  ON QRTZ_JOB_DETAILS (SCHED_NAME, REQUESTS_RECOVERY);
-CREATE INDEX IDX_QRTZ_J_GRP
-  ON QRTZ_JOB_DETAILS (SCHED_NAME, JOB_GROUP);
-
-CREATE INDEX IDX_QRTZ_T_J
-  ON QRTZ_TRIGGERS (SCHED_NAME, JOB_NAME, JOB_GROUP);
-CREATE INDEX IDX_QRTZ_T_JG
-  ON QRTZ_TRIGGERS (SCHED_NAME, JOB_GROUP);
-CREATE INDEX IDX_QRTZ_T_C
-  ON QRTZ_TRIGGERS (SCHED_NAME, CALENDAR_NAME);
-CREATE INDEX IDX_QRTZ_T_G
-  ON QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_GROUP);
-CREATE INDEX IDX_QRTZ_T_STATE
-  ON QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_N_STATE
-  ON QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP, TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_N_G_STATE
-  ON QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_GROUP, TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_NEXT_FIRE_TIME
-  ON QRTZ_TRIGGERS (SCHED_NAME, NEXT_FIRE_TIME);
-CREATE INDEX IDX_QRTZ_T_NFT_ST
-  ON QRTZ_TRIGGERS (SCHED_NAME, TRIGGER_STATE, NEXT_FIRE_TIME);
-CREATE INDEX IDX_QRTZ_T_NFT_MISFIRE
-  ON QRTZ_TRIGGERS (SCHED_NAME, MISFIRE_INSTR, NEXT_FIRE_TIME);
-CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE
-  ON QRTZ_TRIGGERS (SCHED_NAME, MISFIRE_INSTR, NEXT_FIRE_TIME, TRIGGER_STATE);
-CREATE INDEX IDX_QRTZ_T_NFT_ST_MISFIRE_GRP
-  ON QRTZ_TRIGGERS (SCHED_NAME, MISFIRE_INSTR, NEXT_FIRE_TIME, TRIGGER_GROUP, TRIGGER_STATE);
-
-CREATE INDEX IDX_QRTZ_FT_TRIG_INST_NAME
-  ON QRTZ_FIRED_TRIGGERS (SCHED_NAME, INSTANCE_NAME);
-CREATE INDEX IDX_QRTZ_FT_INST_JOB_REQ_RCVRY
-  ON QRTZ_FIRED_TRIGGERS (SCHED_NAME, INSTANCE_NAME, REQUESTS_RECOVERY);
-CREATE INDEX IDX_QRTZ_FT_J_G
-  ON QRTZ_FIRED_TRIGGERS (SCHED_NAME, JOB_NAME, JOB_GROUP);
-CREATE INDEX IDX_QRTZ_FT_JG
-  ON QRTZ_FIRED_TRIGGERS (SCHED_NAME, JOB_GROUP);
-CREATE INDEX IDX_QRTZ_FT_T_G
-  ON QRTZ_FIRED_TRIGGERS (SCHED_NAME, TRIGGER_NAME, TRIGGER_GROUP);
-CREATE INDEX IDX_QRTZ_FT_TG
-  ON QRTZ_FIRED_TRIGGERS (SCHED_NAME, TRIGGER_GROUP);
-
-
-COMMIT;