diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..76557cd
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM postgres
+
+ENV POSTGRES_PASSWORD=postgres_extensions
+ENV POSTGRES_USER=postgres_extensions
+ENV POSTGRES_DB=pg_extensions_test
+
+RUN echo "CREATE EXTENSION hstore" >> /docker-entrypoint-initdb.d/hstore.sql
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..38cf2bc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+.PHONY: test
+
+image :
+	docker build -f Dockerfile -t grails/postgres-extensions .
+
+test :
+	./gradlew clean ;\
+	docker run --rm --name pg_extensions_test -p 5432:5432 -d grails/postgres-extensions ;\
+	./gradlew check ;\
+	docker container kill pg_extensions_test
+
+all : image test
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0191dcf..64c5446 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,14 +11,14 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "org.grails.plugins:hibernate5:${gormVersion - '.RELEASE'}"
+        classpath "org.grails.plugins:hibernate5:7.0.0"
         classpath 'net.saliman:gradle-cobertura-plugin:2.5.4'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
     }
 }
 
-version '6.1.0'
+version '7.0.0'
 group 'org.grails.plugins'
 
 apply plugin: 'eclipse'
@@ -75,10 +75,9 @@ dependencies {
     profile 'org.grails.profiles:web-plugin'
     provided 'org.grails:grails-plugin-services'
     provided 'org.grails:grails-plugin-domain-class'
-    testCompile 'org.grails:grails-plugin-testing'
     testCompile 'org.grails:grails-gorm-testing-support'
 
-    provided 'org.postgresql:postgresql:42.2.2'
+    provided 'org.postgresql:postgresql:42.2.6'
 
     // plugins
     provided 'org.grails.plugins:hibernate5'
@@ -91,10 +90,6 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.4'
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = gradleWrapperVersion
-}
-
 bintray {
     pkg {
         userOrg = 'kaleidos'
diff --git a/gradle.properties b/gradle.properties
index 8264941..bbc3fbc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-gradleWrapperVersion=4.7
-grailsVersion=3.3.5
-hibernateVersion=5.2.17.Final
-gormVersion=6.1.9.RELEASE
+gradleWrapperVersion=5.1.1
+grailsVersion=4.0.0
+hibernateVersion=5.4.0.Final
+gormVersion=7.0.2.RELEASE
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 91ca28c..94336fc 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 16d2805..558870d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/groovy/net/kaleidos/hibernate/PostgresqlExtensionsDialect.groovy b/src/main/groovy/net/kaleidos/hibernate/PostgresqlExtensionsDialect.groovy
index 429087b..0edb9d3 100644
--- a/src/main/groovy/net/kaleidos/hibernate/PostgresqlExtensionsDialect.groovy
+++ b/src/main/groovy/net/kaleidos/hibernate/PostgresqlExtensionsDialect.groovy
@@ -5,12 +5,12 @@ import net.kaleidos.hibernate.usertype.ArrayType
 import net.kaleidos.hibernate.usertype.HstoreMapType
 import net.kaleidos.hibernate.usertype.JsonMapType
 import net.kaleidos.hibernate.usertype.JsonbMapType
-import org.hibernate.dialect.PostgreSQL94Dialect
+import org.hibernate.dialect.PostgreSQL95Dialect
 
 import java.sql.Types
 
 @CompileStatic
-class PostgresqlExtensionsDialect extends PostgreSQL94Dialect {
+class PostgresqlExtensionsDialect extends PostgreSQL95Dialect {
 
     private static final String SEQUENCE_PER_TABLE = 'dataSource.postgresql.extensions.sequence_per_table'