diff --git a/README.md b/README.md
index cf19efe..1a12731 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ A collection of delicious docker recipes.
 
 - [x] kafka-arm
 - [x] kafka-manager
-- [x] presto
+- [x] presto-server
 - [x] superset-arm
 - [x] zookeeper-arm
 
diff --git a/presto/Dockerfile b/presto-server/Dockerfile
similarity index 84%
rename from presto/Dockerfile
rename to presto-server/Dockerfile
index 352c25e..57be86c 100644
--- a/presto/Dockerfile
+++ b/presto-server/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Dockerfile for presto
+# Dockerfile for presto-server
 #
 
 FROM java:8-jre-alpine
@@ -7,7 +7,7 @@ MAINTAINER kev <noreply@easypi.pro>
 
 ENV PRESTO_VERSION 0.208
 ENV PRESTO_URL https://repo1.maven.org/maven2/com/facebook/presto/presto-server/$PRESTO_VERSION/presto-server-$PRESTO_VERSION.tar.gz
-ENV PRESTO_HOME /opt/presto
+ENV PRESTO_HOME /opt/presto-server
 
 WORKDIR $PRESTO_HOME
 
@@ -16,7 +16,7 @@ RUN set -xe \
     && curl -sSL $PRESTO_URL | tar xz --strip 1 \
     && apk del curl tar
 
-VOLUME /var/presto/data
+VOLUME /data
 
 EXPOSE 8080
 
diff --git a/presto/README.md b/presto-server/README.md
similarity index 100%
rename from presto/README.md
rename to presto-server/README.md
diff --git a/presto/conf/coordinator/catalog/jmx.properties b/presto-server/conf/coordinator/catalog/jmx.properties
similarity index 100%
rename from presto/conf/coordinator/catalog/jmx.properties
rename to presto-server/conf/coordinator/catalog/jmx.properties
diff --git a/presto/conf/coordinator/catalog/tpcds.properties b/presto-server/conf/coordinator/catalog/tpcds.properties
similarity index 100%
rename from presto/conf/coordinator/catalog/tpcds.properties
rename to presto-server/conf/coordinator/catalog/tpcds.properties
diff --git a/presto/conf/coordinator/catalog/tpch.properties b/presto-server/conf/coordinator/catalog/tpch.properties
similarity index 100%
rename from presto/conf/coordinator/catalog/tpch.properties
rename to presto-server/conf/coordinator/catalog/tpch.properties
diff --git a/presto/conf/coordinator/config.properties b/presto-server/conf/coordinator/config.properties
similarity index 100%
rename from presto/conf/coordinator/config.properties
rename to presto-server/conf/coordinator/config.properties
diff --git a/presto/conf/coordinator/jvm.config b/presto-server/conf/coordinator/jvm.config
similarity index 100%
rename from presto/conf/coordinator/jvm.config
rename to presto-server/conf/coordinator/jvm.config
diff --git a/presto/conf/coordinator/log.properties b/presto-server/conf/coordinator/log.properties
similarity index 100%
rename from presto/conf/coordinator/log.properties
rename to presto-server/conf/coordinator/log.properties
diff --git a/presto/conf/coordinator/node.properties b/presto-server/conf/coordinator/node.properties
similarity index 60%
rename from presto/conf/coordinator/node.properties
rename to presto-server/conf/coordinator/node.properties
index aeffa9b..fa4cd1e 100644
--- a/presto/conf/coordinator/node.properties
+++ b/presto-server/conf/coordinator/node.properties
@@ -1,3 +1,3 @@
 node.environment=production
 node.id=coordinator
-node.data-dir=/var/presto/data
+node.data-dir=/data
diff --git a/presto/conf/standalone/catalog/jmx.properties b/presto-server/conf/standalone/catalog/jmx.properties
similarity index 100%
rename from presto/conf/standalone/catalog/jmx.properties
rename to presto-server/conf/standalone/catalog/jmx.properties
diff --git a/presto/conf/standalone/catalog/tpcds.properties b/presto-server/conf/standalone/catalog/tpcds.properties
similarity index 100%
rename from presto/conf/standalone/catalog/tpcds.properties
rename to presto-server/conf/standalone/catalog/tpcds.properties
diff --git a/presto/conf/standalone/catalog/tpch.properties b/presto-server/conf/standalone/catalog/tpch.properties
similarity index 100%
rename from presto/conf/standalone/catalog/tpch.properties
rename to presto-server/conf/standalone/catalog/tpch.properties
diff --git a/presto/conf/standalone/config.properties b/presto-server/conf/standalone/config.properties
similarity index 100%
rename from presto/conf/standalone/config.properties
rename to presto-server/conf/standalone/config.properties
diff --git a/presto/conf/standalone/jvm.config b/presto-server/conf/standalone/jvm.config
similarity index 100%
rename from presto/conf/standalone/jvm.config
rename to presto-server/conf/standalone/jvm.config
diff --git a/presto/conf/standalone/log.properties b/presto-server/conf/standalone/log.properties
similarity index 100%
rename from presto/conf/standalone/log.properties
rename to presto-server/conf/standalone/log.properties
diff --git a/presto/conf/standalone/node.properties b/presto-server/conf/standalone/node.properties
similarity index 60%
rename from presto/conf/standalone/node.properties
rename to presto-server/conf/standalone/node.properties
index aeffa9b..fa4cd1e 100644
--- a/presto/conf/standalone/node.properties
+++ b/presto-server/conf/standalone/node.properties
@@ -1,3 +1,3 @@
 node.environment=production
 node.id=coordinator
-node.data-dir=/var/presto/data
+node.data-dir=/data
diff --git a/presto/conf/worker1/catalog/jmx.properties b/presto-server/conf/worker1/catalog/jmx.properties
similarity index 100%
rename from presto/conf/worker1/catalog/jmx.properties
rename to presto-server/conf/worker1/catalog/jmx.properties
diff --git a/presto/conf/worker1/catalog/tpcds.properties b/presto-server/conf/worker1/catalog/tpcds.properties
similarity index 100%
rename from presto/conf/worker1/catalog/tpcds.properties
rename to presto-server/conf/worker1/catalog/tpcds.properties
diff --git a/presto/conf/worker1/catalog/tpch.properties b/presto-server/conf/worker1/catalog/tpch.properties
similarity index 100%
rename from presto/conf/worker1/catalog/tpch.properties
rename to presto-server/conf/worker1/catalog/tpch.properties
diff --git a/presto/conf/worker1/config.properties b/presto-server/conf/worker1/config.properties
similarity index 100%
rename from presto/conf/worker1/config.properties
rename to presto-server/conf/worker1/config.properties
diff --git a/presto/conf/worker1/jvm.config b/presto-server/conf/worker1/jvm.config
similarity index 100%
rename from presto/conf/worker1/jvm.config
rename to presto-server/conf/worker1/jvm.config
diff --git a/presto/conf/worker1/log.properties b/presto-server/conf/worker1/log.properties
similarity index 100%
rename from presto/conf/worker1/log.properties
rename to presto-server/conf/worker1/log.properties
diff --git a/presto/conf/worker1/node.properties b/presto-server/conf/worker1/node.properties
similarity index 58%
rename from presto/conf/worker1/node.properties
rename to presto-server/conf/worker1/node.properties
index 31e6879..32a0bdd 100644
--- a/presto/conf/worker1/node.properties
+++ b/presto-server/conf/worker1/node.properties
@@ -1,3 +1,3 @@
 node.environment=production
 node.id=worker1
-node.data-dir=/var/presto/data
+node.data-dir=/data
diff --git a/presto-server/docker-compose.yml b/presto-server/docker-compose.yml
new file mode 100644
index 0000000..72093c6
--- /dev/null
+++ b/presto-server/docker-compose.yml
@@ -0,0 +1,19 @@
+coordinator:
+  image: vimagick/presto-server
+  ports:
+    - "8080:8080"
+  volumes:
+    - ./conf/coordinator:/opt/presto-server/etc
+    - ./data/coordinator:/data
+  restart: always
+
+worker1:
+  image: vimagick/presto-server
+  ports:
+    - "8081:8080"
+  volumes:
+    - ./conf/worker1:/opt/presto-server/etc
+    - ./data/worker1:/data
+  links:
+    - coordinator
+  restart: always
diff --git a/presto/docker-compose.yml b/presto/docker-compose.yml
deleted file mode 100644
index 259a2f9..0000000
--- a/presto/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-coordinator:
-  image: vimagick/presto
-  ports:
-    - "8080:8080"
-  volumes:
-    - ./conf/coordinator:/opt/presto/etc
-    - ./data/coordinator:/var/lib/presto
-  restart: always
-
-worker1:
-  image: vimagick/presto
-  ports:
-    - "8081:8080"
-  volumes:
-    - ./conf/worker1:/opt/presto/etc
-    - ./data/worker1:/var/lib/presto
-  links:
-    - coordinator
-  restart: always