diff --git a/docker-compose.yml b/docker-compose.yml
index 83d901c5..98caceb3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,7 @@ services:
             - /var/lib/mariadb
             - /var/lib/redis
             - /var/lib/memcached
+            - /var/lib/neo4j
 
 ### Nginx Server Container ##################################
 
@@ -94,6 +95,18 @@ services:
         links:
             - php-fpm
 
+### Neo4j Container #########################################
+
+    neo4j:
+        build: ./neo4j
+        ports:
+            - "7474:7474"
+            - "7687:7687"
+        volumes_from:
+            - data
+        links:
+            - php-fpm
+
 ### Redis Container #########################################
 
     redis:
diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
new file mode 100644
index 00000000..fd17c241
--- /dev/null
+++ b/neo4j/Dockerfile
@@ -0,0 +1,9 @@
+FROM neo4j:3.0
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+VOLUME /var/lib/neo4j
+
+EXPOSE 7474 7687
+
+CMD ["neo4j"]