diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf
index e59eed60e7..ac7d410626 100644
--- a/spring-data-neo4j-aspects/template.mf
+++ b/spring-data-neo4j-aspects/template.mf
@@ -15,8 +15,9 @@ Import-Template:
  org.springframework.data.*;version="[1.0.0, 2.0.0)",
  org.springframework.persistence.*;version="[1.0.0, 3.0.0)",
  org.springframework.data.neo4j.*;version="[1.0.0, 3.0.0)",
- org.neo4j.*;version="0",
- org.neo4j.cypher.*;version="0";resolution:=optional,
+ org.neo4j.cypherdsl.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.*;version="${neo4j.version}",
  org.w3c.dom.*;version="0",
  org.aspectj.*;version="[1.6.5, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index 4bb1733071..c4cd7719da 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -15,8 +15,9 @@ Import-Template:
  org.springframework.data.*;version="[1.0.0, 2.0.0)",
  org.springframework.persistence.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.neo4j.*;version="0",
- org.neo4j.*;version="0",
- org.neo4j.cypher.*;version="0";resolution:=optional,
+ org.neo4j.cypherdsl.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.*;version="${neo4j.version}",
  org.w3c.dom.*;version="0",
  org.aspectj.*;version="[1.6.5, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index 4b0d196eaa..779b4bd168 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -9,7 +9,9 @@ Import-Template:
  org.springframework.data.neo4j.annotation.*;version="[1.0.0, 2.0.0)",
  org.springframework.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.neo4j.*;version="0",
- org.neo4j.*;version="0",
+ org.neo4j.server.plugins.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.*;version="${neo4j.version}",
  org.w3c.dom.*;version="0",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.apache.lucene.*;version="0",
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index 5490910caf..ead4677ff5 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -131,7 +131,7 @@
 		<dependency>
 			<groupId>org.neo4j</groupId>
 			<artifactId>neo4j-cypher-dsl</artifactId>
-            <!--optional>true</optional-->
+            <optional>true</optional>
 		</dependency>
         <dependency>
             <groupId>org.neo4j</groupId>
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
index f06c876399..eba836d98c 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
@@ -111,7 +111,8 @@ public MappingInfrastructure mappingInfrastructure() throws Exception {
         }
         return infrastructure;
     }
-    @Bean
+
+    @Bean(initMethod="postConstruct")
 	public Neo4jTemplate neo4jTemplate() throws Exception {
         final Neo4jTemplate neo4jTemplate = new Neo4jTemplate();
         neo4jTemplate.setInfrastructure(mappingInfrastructure());
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index 8e6da2424c..868e1ed841 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -15,8 +15,10 @@ Import-Template:
  org.springframework.data.*;version="[1.0.0, 2.0.0)",
  org.springframework.persistence.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.neo4j.*;version="0",
- org.neo4j.*;version="0",
- org.neo4j.cypher.*;version="0";resolution:=optional,
+ org.neo4j.server.plugins.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.cypherdsl.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.cypher.*;version="${neo4j.version}";resolution:=optional,
+ org.neo4j.*;version="${neo4j.version}",
  org.w3c.dom.*;version="0",
  org.aspectj.*;version="[1.6.5, 2.0.0)",
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",