diff --git a/deploy/docker/.gitignore b/deploy/docker/.gitignore
new file mode 100644
index 0000000000..cd3d225360
--- /dev/null
+++ b/deploy/docker/.gitignore
@@ -0,0 +1 @@
+logs
\ No newline at end of file
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
new file mode 100644
index 0000000000..608af99fdb
--- /dev/null
+++ b/deploy/docker/Dockerfile
@@ -0,0 +1,16 @@
+FROM adoptopenjdk:11-jre-hotspot
+
+RUN apt-get install -y supervisor
+
+RUN mkdir -p /opt/cloudbeaver
+
+COPY ../cloudbeaver/* /opt/cloudbeaver/
+RUN ["chmod", "+x", "/opt/cloudbeaver/run-server.sh"]
+
+COPY ../supervisord/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/docker-compose.yml b/deploy/docker/docker-compose.yml
new file mode 100644
index 0000000000..562bfcb127
--- /dev/null
+++ b/deploy/docker/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '3'
+services:
+  cloudbeaver:
+    build: .
+    container_name: cloudbeaver-container
+    ports:
+      - "8978:8978"
+    volumes:
+      - "./logs:/opt/cloudbeaver/logs"
diff --git a/deploy/supervisor/cloudbeaver.conf b/deploy/supervisor/cloudbeaver.conf
new file mode 100644
index 0000000000..b0aa0e5f20
--- /dev/null
+++ b/deploy/supervisor/cloudbeaver.conf
@@ -0,0 +1,7 @@
+[program:cloudbeaver_demo]
+directory=/opt/cloudbeaver/deploy/cloudbeaver/
+command=/opt/cloudbeaver/deploy/cloudbeaver/run-server.sh
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/var/log/cloudbeaver/server.log