diff --git a/Dockerfile b/Dockerfile
index 150a16c..8a05f55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,64 @@
-FROM python:3.10
-LABEL authors="hideyoshi"
+# `python-base` sets up all our shared environment variables
+FROM python:3.10-slim as python-base
 
-# Configure Poetry
-ENV POETRY_VERSION=1.5.1
-ENV POETRY_HOME=/opt/poetry
-ENV POETRY_VENV=/opt/poetry-venv
-ENV POETRY_CACHE_DIR=/opt/.cache
+    # python
+ENV PYTHONUNBUFFERED=1 \
+    # prevents python creating .pyc files
+    PYTHONDONTWRITEBYTECODE=1 \
+    \
+    # pip
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    \
+    # poetry
+    # https://python-poetry.org/docs/configuration/#using-environment-variables
+    POETRY_VERSION=1.5.1 \
+    # make poetry install to this location
+    POETRY_HOME="/opt/poetry" \
+    # make poetry create the virtual environment in the project's root
+    # it gets named `.venv`
+    POETRY_VIRTUALENVS_IN_PROJECT=true \
+    # do not ask any interactive question
+    POETRY_NO_INTERACTION=1 \
+    \
+    # paths
+    # this is where our requirements + virtual environment will live
+    PYSETUP_PATH="/opt/pysetup" \
+    VENV_PATH="/opt/pysetup/.venv"
 
-# Install poetry separated from system interpreter
-RUN python3 -m venv $POETRY_VENV \
-    && $POETRY_VENV/bin/pip install -U pip setuptools \
-    && $POETRY_VENV/bin/pip install poetry==${POETRY_VERSION}
 
-# Add `poetry` to PATH
-ENV PATH="${PATH}:${POETRY_VENV}/bin"
+# prepend poetry and venv to path
+ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 
-WORKDIR /app
 
-# Install dependencies
+# `builder-base` stage is used to build deps + create our virtual environment
+FROM python-base as builder-base
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        # deps for installing poetry
+        curl \
+        # deps for building python deps
+        build-essential
+
+# install poetry - respects $POETRY_VERSION & $POETRY_HOME
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# copy project requirement files here to ensure they will be cached.
+WORKDIR $PYSETUP_PATH
 COPY . .
 
-RUN poetry install
+# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
+RUN poetry install --no-dev
+# `builder-base` stage is used to build deps + create our virtual environment
+
+
+FROM python-base as production
+
+COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
+WORKDIR $PYSETUP_PATH
 
 EXPOSE 5000-9000
 
 # Run your app
-CMD [ "poetry", "run", "python", "-m", "storage_service" ]
\ No newline at end of file
+CMD [ "python", "-m", "storage_service" ]
\ No newline at end of file
diff --git a/run-queue.sh b/run-queue.sh
new file mode 100755
index 0000000..3f1d882
--- /dev/null
+++ b/run-queue.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+
+rq worker --with-scheduler
+
+exec "$@"
\ No newline at end of file