diff --git a/docker-compose.yml b/docker-compose.yml
index 98caceb..1fb6610 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
             - /var/lib/mariadb
             - /var/lib/redis
             - /var/lib/memcached
-            - /var/lib/neo4j
+            - /var/lib/neo4j/data
 
 ### Nginx Server Container ##################################
 
@@ -101,7 +101,9 @@ services:
         build: ./neo4j
         ports:
             - "7474:7474"
-            - "7687:7687"
+            - "1337:1337"
+        environment:
+            - NEO4J_AUTH=homestead:secret
         volumes_from:
             - data
         links:
diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
index fd17c24..d1ebda6 100644
--- a/neo4j/Dockerfile
+++ b/neo4j/Dockerfile
@@ -1,9 +1,7 @@
-FROM neo4j:3.0
+FROM tpires/neo4j
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-VOLUME /var/lib/neo4j
+VOLUME /var/lib/neo4j/data
 
-EXPOSE 7474 7687
-
-CMD ["neo4j"]
+EXPOSE 7474 1337