diff --git a/pom.xml b/pom.xml
index a9e6ead..84c0a47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,16 +10,16 @@
     </parent>
     <groupId>com.pj</groupId>
     <artifactId>liquibasedemo</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <name>liquibasedemo</name>
     <description>Liquibase Demo project with Spring Boot and Spring Data</description>
 
     <properties>
         <spring-boot.version>2.3.1.RELEASE</spring-boot.version>
         <hibernate.version>5.4.17.Final</hibernate.version>
-        <liquibase-core.version>3.10.0</liquibase-core.version>
-        <liquibase-maven-plugin.version>3.10.0</liquibase-maven-plugin.version>
-        <liquibase-hibernate5.version>3.10.0</liquibase-hibernate5.version>
+        <liquibase-core.version>4.0.0</liquibase-core.version>
+        <liquibase-maven-plugin.version>4.0.0</liquibase-maven-plugin.version>
+        <liquibase-hibernate5.version>3.10.1</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <javassist.version>3.27.0-GA</javassist.version>
         <jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
@@ -93,21 +93,21 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <activatedProfile>dev</activatedProfile>
+                <activeProfile>dev</activeProfile>
             </properties>
         </profile>
 
         <profile>
             <id>test</id>
             <properties>
-                <activatedProfile>test</activatedProfile>
+                <activeProfile>test</activeProfile>
             </properties>
         </profile>
 
         <profile>
             <id>prod</id>
             <properties>
-                <activatedProfile>prod</activatedProfile>
+                <activeProfile>prod</activeProfile>
             </properties>
         </profile>
     </profiles>
@@ -136,8 +136,9 @@
                 <version>${liquibase-maven-plugin.version}</version>
                 <configuration>
                     <propertyFile>src/main/resources/liquibase.properties</propertyFile>
-                    <changeLogFile>src/main/resources/db/db.changelog-master.xml</changeLogFile>
-                    <diffChangeLogFile>src/main/resources/db/changelog/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
+                    <outputChangeLogFile>src/main/resources/db/db.changelog-${activeProfile}.xml</outputChangeLogFile>
+                    <changeLogFile>src/main/resources/db/db.changelog-${activeProfile}.xml</changeLogFile>
+                    <diffChangeLogFile>src/main/resources/db/changelog/${activeProfile}/${maven.build.timestamp}_changelog.xml</diffChangeLogFile>
                     <logging>info</logging>
                 </configuration>
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 145c37e..ed317d5 100755
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,25 +8,14 @@ spring:
     url: ${spring.datasource.url}
     username: ${spring.datasource.username}
     password: ${spring.datasource.password}
-
   jpa:
     hibernate:
       ddl-auto: none
 
   # Liquibase properties
-  devtools:
-    restart:
-      enabled: true
+  liquibase:
+    enabled: false
 
 ## Server Properties
 server:
-  port: 8080
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: ["health","info"]
-  endpoint:
-    auditevents:
-      enabled: true
+  port: 8081
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 819187e..970ef6f 100755
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -15,21 +15,11 @@ spring:
       ddl-auto: update
 
   # Liquibase properties
-  devtools:
-    restart:
-      enabled: true
-
+  liquibase:
+    enabled: false
 
 ## Server Properties
 server:
-  port: 8080
+  port: 8081
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: ["health","info"]
-  endpoint:
-    auditevents:
-      enabled: true
 
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 4e6c956..c0f3836 100755
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -14,20 +14,11 @@ spring:
       ddl-auto: none
 
   # Liquibase properties
-  devtools:
-    restart:
-      enabled: true
+  liquibase:
+    enabled: false
 
 ## Server Properties
 server:
-  port: 8080
+  port: 8081
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: ["health","info"]
-  endpoint:
-    auditevents:
-      enabled: true
 
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 4e6c956..c0f3836 100755
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -14,20 +14,11 @@ spring:
       ddl-auto: none
 
   # Liquibase properties
-  devtools:
-    restart:
-      enabled: true
+  liquibase:
+    enabled: false
 
 ## Server Properties
 server:
-  port: 8080
+  port: 8081
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: ["health","info"]
-  endpoint:
-    auditevents:
-      enabled: true
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b28724..9eefe66 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: @activatedProfile@
+    active:  '@activeProfile@'
diff --git a/src/main/resources/db/changelog/2020-06-22T05:48:08Z_changelog.xml b/src/main/resources/db/changelog/2020-06-22T05:48:08Z_changelog.xml
deleted file mode 100644
index dc14b1e..0000000
--- a/src/main/resources/db/changelog/2020-06-22T05:48:08Z_changelog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<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.9.xsd">
-    <changeSet author="jaddap2 (generated)" id="1592804892005-1">
-        <createTable tableName="country">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="countryPK"/>
-            </column>
-            <column name="code" type="VARCHAR(255)"/>
-            <column name="iso_code" type="VARCHAR(255)"/>
-            <column name="iso_code_test" type="VARCHAR(255)"/>
-            <column name="name" type="VARCHAR(255)"/>
-            <column name="region_id" type="BIGINT"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592804892005-2">
-        <createTable tableName="region">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="regionPK"/>
-            </column>
-            <column name="name" type="VARCHAR(255)"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="jaddap2 (generated)" id="1592804892005-3">
-        <addForeignKeyConstraint baseColumnNames="region_id" baseTableName="country" constraintName="FKs3bda8801uhqtttuaur9r6eic" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="region" validate="true"/>
-    </changeSet>
-</databaseChangeLog>
diff --git a/src/main/resources/db/db.changelog-master.xml b/src/main/resources/db/db.changelog-dev.xml
similarity index 89%
rename from src/main/resources/db/db.changelog-master.xml
rename to src/main/resources/db/db.changelog-dev.xml
index a50025e..9195aab 100644
--- a/src/main/resources/db/db.changelog-master.xml
+++ b/src/main/resources/db/db.changelog-dev.xml
@@ -2,5 +2,5 @@
 <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="db/changelog/" />
+    <includeAll path="db/changelog/dev" />
 </databaseChangeLog>
diff --git a/src/main/resources/db/db.changelog-prod.xml b/src/main/resources/db/db.changelog-prod.xml
new file mode 100644
index 0000000..c97012a
--- /dev/null
+++ b/src/main/resources/db/db.changelog-prod.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<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="db/changelog/prod" />
+</databaseChangeLog>
diff --git a/src/main/resources/db/db.changelog-test.xml b/src/main/resources/db/db.changelog-test.xml
new file mode 100644
index 0000000..881c01d
--- /dev/null
+++ b/src/main/resources/db/db.changelog-test.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<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="db/changelog/test" />
+</databaseChangeLog>
diff --git a/src/main/resources/liquibase.properties b/src/main/resources/liquibase.properties
index fbe4f3f..ffbd5d4 100644
--- a/src/main/resources/liquibase.properties
+++ b/src/main/resources/liquibase.properties
@@ -1,5 +1,12 @@
+
+####  Database properties
 url=${liquibase.url}
 username=${liquibase.username}
 password=${liquibase.password}
 driver=com.mysql.cj.jdbc.Driver
-referenceUrl=hibernate:spring:com.pj.liquibasedemo.domain?dialect=org.hibernate.dialect.MySQL8Dialect&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+
+#### Reference database properties
+referenceUrl=${liquibase.referenceUrl}
+referenceDriver=com.mysql.cj.jdbc.Driver
+referenceUsername=${liquibase.referenceUsername}
+referencePassword=${liquibase.referencePassword}