diff --git a/Dockerfile b/Dockerfile
index e7daeea..2f55c19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,36 @@
-FROM python:3.9
+ARG python_version=3.9
+FROM python:${python_version}-slim
 LABEL maintainer "contact@ipdb.global"
-RUN mkdir -p /usr/src/app
-COPY . /usr/src/app/
-WORKDIR /usr/src/app
-RUN apt-get -qq update \
-    && apt-get -y upgrade \
-    && apt-get install -y jq vim zsh build-essential cmake\
-    && pip install . \
+
+RUN apt-get update \
+    && apt-get install -y git zsh curl\
+    && apt-get install -y tarantool-common\
+    && apt-get install -y vim build-essential cmake\
+    && pip install -U pip \
     && apt-get autoremove \
     && apt-get clean
+ARG backend
+ARG abci_status
 
-VOLUME ["/data", "/certs"]
-
+# When developing with Python in a docker container, we are using PYTHONBUFFERED
+# to force stdin, stdout and stderr to be totally unbuffered and to capture logs/outputs
 ENV PYTHONUNBUFFERED 0
-ENV PLANETMINT_CONFIG_PATH /data/.planetmint
+
+ENV PLANETMINT_DATABASE_PORT 3303
+ENV PLANETMINT_DATABASE_BACKEND $backend
 ENV PLANETMINT_SERVER_BIND 0.0.0.0:9984
 ENV PLANETMINT_WSSERVER_HOST 0.0.0.0
 ENV PLANETMINT_WSSERVER_SCHEME ws
+
 ENV PLANETMINT_WSSERVER_ADVERTISED_HOST 0.0.0.0
 ENV PLANETMINT_WSSERVER_ADVERTISED_SCHEME ws
-ENV PLANETMINT_WSSERVER_ADVERTISED_PORT 9985
-ENTRYPOINT ["planetmint"]
-CMD ["start"]
+
+ENV PLANETMINT_TENDERMINT_PORT 26657
+
+ENV PLANETMINT_CI_ABCI ${abci_status}
+
+RUN mkdir -p /usr/src/app
+COPY . /usr/src/app/
+WORKDIR /usr/src/app
+RUN pip install -e .[dev]
+RUN pip install flask-cors
diff --git a/docker-compose.yml b/docker-compose.yml
index b4f37a6..6375756 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - tarantool
     build:
       context: .
-      dockerfile: Dockerfile-dev
+      dockerfile: Dockerfile
     volumes:
       - ./planetmint:/usr/src/app/planetmint
       - ./tests:/usr/src/app/tests
@@ -60,7 +60,7 @@ services:
       interval: 3s
       timeout: 5s
       retries: 5
-    command: 'scripts/entrypoint.sh'
+    command: 'planetmint -l DEBUG start'
     restart: always
   
   tendermint:
@@ -94,7 +94,7 @@ services:
       - vdocs
     build:
       context: .
-      dockerfile: Dockerfile-dev
+      dockerfile: Dockerfile
       args:
         backend: tarantool
     volumes: