diff --git a/jpa/java8/pom.xml b/jpa/java8/pom.xml
index 048ffe0c..0b22a5bd 100644
--- a/jpa/java8/pom.xml
+++ b/jpa/java8/pom.xml
@@ -13,16 +13,10 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.jadira.usertype</groupId>
-			<artifactId>usertype.extended</artifactId>
-			<version>3.2.0.GA</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
-			<version>1.8.0.DATAJPA-650-SNAPSHOT</version>
+			<version>1.8.0.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java b/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java
index 74592608..7b7ea75f 100644
--- a/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java
+++ b/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java
@@ -15,13 +15,12 @@
  */
 package example.springdata.jpa.java8;
 
-import java.time.ZonedDateTime;
+import java.time.LocalDateTime;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 
-import org.hibernate.annotations.Type;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 
@@ -33,11 +32,6 @@ public class AbstractEntity {
 
 	@Id @GeneratedValue Long id;
 
-	@CreatedDate//
-	@Type(type = "org.jadira.usertype.dateandtime.threeten.PersistentZonedDateTime")//
-	ZonedDateTime createdDate;
-
-	@LastModifiedDate//
-	@Type(type = "org.jadira.usertype.dateandtime.threeten.PersistentZonedDateTime")//
-	ZonedDateTime modifiedDate;
+	@CreatedDate LocalDateTime createdDate;
+	@LastModifiedDate LocalDateTime modifiedDate;
 }
diff --git a/jpa/java8/src/main/java/example/springdata/jpa/java8/AuditingConfiguration.java b/jpa/java8/src/main/java/example/springdata/jpa/java8/AuditingConfiguration.java
index 882c3f9d..daa8e3db 100644
--- a/jpa/java8/src/main/java/example/springdata/jpa/java8/AuditingConfiguration.java
+++ b/jpa/java8/src/main/java/example/springdata/jpa/java8/AuditingConfiguration.java
@@ -16,11 +16,14 @@
 package example.springdata.jpa.java8;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.orm.jpa.EntityScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.domain.support.Jsr310JpaConverters;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @Configuration
 @EnableAutoConfiguration
+@EntityScan(basePackageClasses = { AuditingConfiguration.class, Jsr310JpaConverters.class })
 @EnableJpaAuditing
 class AuditingConfiguration {