diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ae8b7b..c4ab6a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,6 +50,12 @@ workflows:
               only: /^v.*/
       - docker/publish: &docker-push
           name: "docker/publish-release"
+          dockerfile: docker/Dockerfile_with_frontend
+          after-checkout:
+            - attach_workspace:
+                at: .
+            - restore_cache:
+                key: frontend_build_res-{{ checksum "frontend.hash" }}
           requires:
             - test
           filters:
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile
diff --git a/Dockerfile_browser b/docker/Dockerfile_browser
similarity index 100%
rename from Dockerfile_browser
rename to docker/Dockerfile_browser
diff --git a/Dockerfile_tuna b/docker/Dockerfile_tuna
similarity index 100%
rename from Dockerfile_tuna
rename to docker/Dockerfile_tuna
diff --git a/docker/Dockerfile_with_frontend b/docker/Dockerfile_with_frontend
new file mode 100644
index 0000000..de3095d
--- /dev/null
+++ b/docker/Dockerfile_with_frontend
@@ -0,0 +1,9 @@
+FROM python:3.9
+RUN python3 -m pip install poetry && poetry config virtualenvs.create false
+WORKDIR /app
+COPY ./pyproject.toml ./poetry.lock* /app/
+RUN poetry install --no-root --no-dev
+ADD src /app/src
+ADD bot.py /app/
+ENV HOST=0.0.0.0
+CMD ["python", "bot.py"]