diff --git a/build.gradle b/build.gradle
index e897317..f5fdf7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,21 @@ buildscript {
     }
 }
 
+plugins {
+    id 'java'
+    id "org.flywaydb.flyway" version "7.4.0"
+}
+
+sourceCompatibility = '1.8'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile group: 'org.postgresql', name: 'postgresql', version: '42.2.18'
+}
+
 subprojects {
 
     group 'pl.tpolgrabia.trainings.javaee'
@@ -17,8 +32,11 @@ subprojects {
         mavenCentral()
     }
 
+    apply plugin: 'java'
     apply plugin: 'com.bmuschko.cargo'
 
+    sourceCompatibility = '1.8'
+
     dependencies {
         def cargoVersion = '1.6.5'
         cargo "org.codehaus.cargo:cargo-core-uberjar:$cargoVersion",
@@ -29,14 +47,21 @@ subprojects {
         containerId = 'wildfly10x'
 
         remote {
-            hostname = project.ext["cargo.wildfly.hostname"]
-            username = project.ext["cargo.wildfly.username"]
-            password = project.ext["cargo.wildfly.password"]
+            hostname = project.ext["javaeeshowcase.cargo.wildfly.hostname"]
+            username = project.ext["javaeeshowcase.cargo.wildfly.username"]
+            password = project.ext["javaeeshowcase.cargo.wildfly.password"]
 
             containerProperties {
                 property 'cargo.jboss.management-http.port',
-                        project.ext["cargo.wildfly.port"]
+                        project.ext["javaeeshowcase.cargo.wildfly.port"]
             }
         }
     }
 }
+
+flyway {
+    url = project.ext['javaeeshowcase.flyway.url']
+    user = project.ext['javaeeshowcase.flyway.username']
+    password = project.ext['javaeeshowcase.flyway.password']
+    schemas = project.ext['javaeeshowcase.flyway.schemas']
+}
diff --git a/gradle.properties b/gradle.properties
index 0d970c6..f4ad2f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,16 @@
 # please, copy this file to your user-specific $HOME/.gradle/gradle.properties
-# and initialize with correct values
+# and initialize with correct values. User-specific will override the local ones then.
 
-cargo.wildfly.hostname=localhost
-cargo.wildfly.username=test
-cargo.wildfly.password=test
-cargo.wildfly.port=9990
+# Cargo deployment settings
+
+javaeeshowcase.cargo.wildfly.hostname=localhost
+javaeeshowcase.cargo.wildfly.username=test
+javaeeshowcase.cargo.wildfly.password=test
+javaeeshowcase.cargo.wildfly.port=9990
+
+# Flyway db versioning settings
+
+javaeeshowcase.flyway.url=jdbc:postgresql://localhost:5432/test
+javaeeshowcase.flyway.username=test
+javaeeshowcase.flyway.password=test
+javaeeshowcase.flyway.schemas=test
diff --git a/javaee-demo1-ejb/build.gradle b/javaee-demo1-ejb/build.gradle
index b3b8304..3ecadb3 100644
--- a/javaee-demo1-ejb/build.gradle
+++ b/javaee-demo1-ejb/build.gradle
@@ -2,11 +2,9 @@ plugins {
     id 'java'
 }
 
-sourceCompatibility = 1.8
-
 dependencies {
     implementation 'javax:javaee-api:8.0.1'
     // wildfly 10 version I use :-)
     implementation 'org.slf4j:slf4j-api:1.7.22'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/src/main/resources/db/migration/V1.1__add_person.sql b/src/main/resources/db/migration/V1.1__add_person.sql
new file mode 100644
index 0000000..880b9ba
--- /dev/null
+++ b/src/main/resources/db/migration/V1.1__add_person.sql
@@ -0,0 +1,6 @@
+create table users
+(
+    id         serial       not null primary key,
+    first_name text         not null,
+    user_name  varchar(256) not null
+);