diff --git a/README.md b/README.md
index 68b3e06..59d4d34 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ A collection of delicious docker recipes.
 
 - [x] kafka-arm
 - [x] kafka-manager
-- [x] presto-server
+- [x] presto
 - [x] superset-arm
 - [x] zookeeper-arm
 
diff --git a/presto-server/Dockerfile b/presto-server/Dockerfile
deleted file mode 100644
index cf9b122..0000000
--- a/presto-server/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Dockerfile for presto-server
-#
-
-FROM java:8-jre-alpine
-MAINTAINER kev <noreply@easypi.pro>
-
-ENV PRESTO_VERSION=0.221
-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-server
-
-WORKDIR $PRESTO_HOME
-
-RUN set -xe \
-    && apk add --no-cache curl python tar \
-    && curl -sSL $PRESTO_URL | tar xz --strip 1 \
-    && apk del curl tar
-
-VOLUME /data
-
-EXPOSE 8080
-
-ENTRYPOINT ["./bin/launcher"]
-CMD ["run"]
diff --git a/presto/Dockerfile b/presto/Dockerfile
new file mode 100644
index 0000000..f36e3d4
--- /dev/null
+++ b/presto/Dockerfile
@@ -0,0 +1,28 @@
+#
+# Dockerfile for presto
+#
+
+FROM java:8-jre-alpine
+MAINTAINER kev <noreply@easypi.pro>
+
+ENV PRESTO_VERSION=0.221
+ENV PRESTO_SERVER_URL=https://repo1.maven.org/maven2/com/facebook/presto/presto-server/${PRESTO_VERSION}/presto-server-${PRESTO_VERSION}.tar.gz
+ENV PRESTO_CLI_URL=https://repo1.maven.org/maven2/com/facebook/presto/presto-cli/${PRESTO_VERSION}/presto-cli-${PRESTO_VERSION}-executable.jar
+ENV PRESTO_HOME=/opt/presto
+ENV PATH=${PRESTO_HOME}/bin:${PATH}
+
+WORKDIR $PRESTO_HOME
+
+RUN set -xe \
+    && apk add --no-cache curl python tar \
+    && curl -sSL $PRESTO_SERVER_URL | tar xz --strip 1 \
+    && curl -sSL $PRESTO_CLI_URL > ./bin/presto \
+    && chmod +x ./bin/presto \
+    && apk del curl tar
+
+VOLUME /data
+
+EXPOSE 8080
+
+ENTRYPOINT ["launcher"]
+CMD ["run"]
diff --git a/presto-server/README.md b/presto/README.md
similarity index 100%
rename from presto-server/README.md
rename to presto/README.md
diff --git a/presto-server/conf/coordinator/catalog/jmx.properties b/presto/conf/coordinator/catalog/jmx.properties
similarity index 100%
rename from presto-server/conf/coordinator/catalog/jmx.properties
rename to presto/conf/coordinator/catalog/jmx.properties
diff --git a/presto-server/conf/coordinator/catalog/tpcds.properties b/presto/conf/coordinator/catalog/tpcds.properties
similarity index 100%
rename from presto-server/conf/coordinator/catalog/tpcds.properties
rename to presto/conf/coordinator/catalog/tpcds.properties
diff --git a/presto-server/conf/coordinator/catalog/tpch.properties b/presto/conf/coordinator/catalog/tpch.properties
similarity index 100%
rename from presto-server/conf/coordinator/catalog/tpch.properties
rename to presto/conf/coordinator/catalog/tpch.properties
diff --git a/presto-server/conf/coordinator/config.properties b/presto/conf/coordinator/config.properties
similarity index 84%
rename from presto-server/conf/coordinator/config.properties
rename to presto/conf/coordinator/config.properties
index 67707f3..9eebdb0 100644
--- a/presto-server/conf/coordinator/config.properties
+++ b/presto/conf/coordinator/config.properties
@@ -3,5 +3,6 @@ node-scheduler.include-coordinator=false
 http-server.http.port=8080
 query.max-memory=50GB
 query.max-memory-per-node=1GB
+query.max-total-memory-per-node=2GB
 discovery-server.enabled=true
 discovery.uri=http://127.0.0.1:8080
diff --git a/presto-server/conf/coordinator/jvm.config b/presto/conf/coordinator/jvm.config
similarity index 100%
rename from presto-server/conf/coordinator/jvm.config
rename to presto/conf/coordinator/jvm.config
diff --git a/presto-server/conf/coordinator/log.properties b/presto/conf/coordinator/log.properties
similarity index 100%
rename from presto-server/conf/coordinator/log.properties
rename to presto/conf/coordinator/log.properties
diff --git a/presto-server/conf/coordinator/node.properties b/presto/conf/coordinator/node.properties
similarity index 100%
rename from presto-server/conf/coordinator/node.properties
rename to presto/conf/coordinator/node.properties
diff --git a/presto-server/conf/standalone/catalog/jmx.properties b/presto/conf/standalone/catalog/jmx.properties
similarity index 100%
rename from presto-server/conf/standalone/catalog/jmx.properties
rename to presto/conf/standalone/catalog/jmx.properties
diff --git a/presto-server/conf/standalone/catalog/tpcds.properties b/presto/conf/standalone/catalog/tpcds.properties
similarity index 100%
rename from presto-server/conf/standalone/catalog/tpcds.properties
rename to presto/conf/standalone/catalog/tpcds.properties
diff --git a/presto-server/conf/standalone/catalog/tpch.properties b/presto/conf/standalone/catalog/tpch.properties
similarity index 100%
rename from presto-server/conf/standalone/catalog/tpch.properties
rename to presto/conf/standalone/catalog/tpch.properties
diff --git a/presto-server/conf/standalone/config.properties b/presto/conf/standalone/config.properties
similarity index 84%
rename from presto-server/conf/standalone/config.properties
rename to presto/conf/standalone/config.properties
index 6e22c37..d54e2a1 100644
--- a/presto-server/conf/standalone/config.properties
+++ b/presto/conf/standalone/config.properties
@@ -3,5 +3,6 @@ node-scheduler.include-coordinator=true
 http-server.http.port=8080
 query.max-memory=5GB
 query.max-memory-per-node=1GB
+query.max-total-memory-per-node=2GB
 discovery-server.enabled=true
 discovery.uri=http://127.0.0.1:8080
diff --git a/presto-server/conf/standalone/jvm.config b/presto/conf/standalone/jvm.config
similarity index 100%
rename from presto-server/conf/standalone/jvm.config
rename to presto/conf/standalone/jvm.config
diff --git a/presto-server/conf/standalone/log.properties b/presto/conf/standalone/log.properties
similarity index 100%
rename from presto-server/conf/standalone/log.properties
rename to presto/conf/standalone/log.properties
diff --git a/presto-server/conf/standalone/node.properties b/presto/conf/standalone/node.properties
similarity index 70%
rename from presto-server/conf/standalone/node.properties
rename to presto/conf/standalone/node.properties
index fa4cd1e..974b480 100644
--- a/presto-server/conf/standalone/node.properties
+++ b/presto/conf/standalone/node.properties
@@ -1,3 +1,3 @@
 node.environment=production
-node.id=coordinator
+node.id=standalone
 node.data-dir=/data
diff --git a/presto-server/conf/worker1/catalog/jmx.properties b/presto/conf/worker1/catalog/jmx.properties
similarity index 100%
rename from presto-server/conf/worker1/catalog/jmx.properties
rename to presto/conf/worker1/catalog/jmx.properties
diff --git a/presto-server/conf/worker1/catalog/tpcds.properties b/presto/conf/worker1/catalog/tpcds.properties
similarity index 100%
rename from presto-server/conf/worker1/catalog/tpcds.properties
rename to presto/conf/worker1/catalog/tpcds.properties
diff --git a/presto-server/conf/worker1/catalog/tpch.properties b/presto/conf/worker1/catalog/tpch.properties
similarity index 100%
rename from presto-server/conf/worker1/catalog/tpch.properties
rename to presto/conf/worker1/catalog/tpch.properties
diff --git a/presto-server/conf/worker1/config.properties b/presto/conf/worker1/config.properties
similarity index 78%
rename from presto-server/conf/worker1/config.properties
rename to presto/conf/worker1/config.properties
index 3da9ddd..a608438 100644
--- a/presto-server/conf/worker1/config.properties
+++ b/presto/conf/worker1/config.properties
@@ -2,4 +2,5 @@ coordinator=false
 http-server.http.port=8080
 query.max-memory=50GB
 query.max-memory-per-node=1GB
+query.max-total-memory-per-node=2GB
 discovery.uri=http://coordinator:8080
diff --git a/presto-server/conf/worker1/jvm.config b/presto/conf/worker1/jvm.config
similarity index 100%
rename from presto-server/conf/worker1/jvm.config
rename to presto/conf/worker1/jvm.config
diff --git a/presto-server/conf/worker1/log.properties b/presto/conf/worker1/log.properties
similarity index 100%
rename from presto-server/conf/worker1/log.properties
rename to presto/conf/worker1/log.properties
diff --git a/presto-server/conf/worker1/node.properties b/presto/conf/worker1/node.properties
similarity index 100%
rename from presto-server/conf/worker1/node.properties
rename to presto/conf/worker1/node.properties
diff --git a/presto-server/docker-compose.yml b/presto/docker-compose.yml
similarity index 58%
rename from presto-server/docker-compose.yml
rename to presto/docker-compose.yml
index 72093c6..a5f89b9 100644
--- a/presto-server/docker-compose.yml
+++ b/presto/docker-compose.yml
@@ -1,18 +1,18 @@
 coordinator:
-  image: vimagick/presto-server
+  image: vimagick/presto
   ports:
     - "8080:8080"
   volumes:
-    - ./conf/coordinator:/opt/presto-server/etc
+    - ./conf/coordinator:/opt/presto/etc
     - ./data/coordinator:/data
   restart: always
 
 worker1:
-  image: vimagick/presto-server
+  image: vimagick/presto
   ports:
     - "8081:8080"
   volumes:
-    - ./conf/worker1:/opt/presto-server/etc
+    - ./conf/worker1:/opt/presto/etc
     - ./data/worker1:/data
   links:
     - coordinator