diff --git a/chainquery/Dockerfile b/chainquery/Dockerfile
index 9defd80..8370d60 100644
--- a/chainquery/Dockerfile
+++ b/chainquery/Dockerfile
@@ -1,5 +1,26 @@
-## This base image is for running latest lbrycrdd
+## This base image is for running latest chainquery
 FROM ##
 MAINTAINER chamunks [at] gmail [dot] com
 
-ADD https://raw.githubusercontent.com/lbryio/chainquery/master/config/default/chainqueryconfig.toml /etc/chainquery/chainqueryconfig.toml.default
+ADD chainqueryconfig.toml ~/chainqueryconfig.toml
+
+RUN RUN adduser chainquery --gecos GECOS --shell /bin/bash --disabled-password --home /data/ && \
+    apt-get update && \
+    apt-get -y install unzip wget && \
+    apt-get autoclean -y && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget -O /usr/bin/chainquery.zip https://github.com/lbryio/chainquery/releases/download/v1.1.2/chainquery_1.1.2_Linux_x86_64.zip && \
+    cd /usr/bin/ && \
+    unzip chainquery.zip && \
+    rm chainquery.zip
+
+ADD start.sh /usr/local/bin/start
+ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+
+USER lbrycrdd
+
+## Expose Chainquery API port
+EXPOSE 6300 3306
+
+CMD ["start"]