diff --git a/deploy/Dockerfile b/deploy/Dockerfile
new file mode 100644
index 0000000000..39ae373723
--- /dev/null
+++ b/deploy/Dockerfile
@@ -0,0 +1,17 @@
+FROM adoptopenjdk/openjdk11:x86_64-ubuntu-jdk-11.0.7_10
+
+RUN apt-get update
+RUN apt-get install -y supervisor
+
+RUN mkdir -p /opt/cloudbeaver
+
+COPY cloudbeaver /opt/cloudbeaver
+RUN ["chmod", "+x", "/opt/cloudbeaver/run-server.sh"]
+
+COPY supervisor/cloudbeaver.conf /etc/supervisor/conf.d/cloudbeaver.conf
+
+EXPOSE 8978
+
+CMD ["/usr/bin/supervisord"]
+
+# ENTRYPOINT ["/opt/cloudbeaver/run-server.sh"]
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index a3fd5eda9c..8b10ec6f6d 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -1,13 +1,14 @@
-FROM x86_64-ubuntu-jdk-11.0.7_10
+FROM adoptopenjdk/openjdk11:x86_64-ubuntu-jdk-11.0.7_10
 
+RUN apt-get update
 RUN apt-get install -y supervisor
 
 RUN mkdir -p /opt/cloudbeaver
 
-COPY ../cloudbeaver/* /opt/cloudbeaver/
+COPY cloudbeaver /opt/
 RUN ["chmod", "+x", "/opt/cloudbeaver/run-server.sh"]
 
-COPY ../supervisord/cloudbeaver.conf /etc/supervisor/conf.d/cloudbeaver.conf
+COPY supervisord/cloudbeaver.conf /etc/supervisor/conf.d/cloudbeaver.conf
 
 EXPOSE 8978