diff --git a/chart/docker-images.yaml b/chart/docker-images.yaml
index 03726f1400..bbd653a8a5 100644
--- a/chart/docker-images.yaml
+++ b/chart/docker-images.yaml
@@ -1,13 +1,13 @@
 {
   "dockerImage": {
-    "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-c90be33",
-    "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-e3d3193",
+    "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-fff7ce4",
+    "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-fff7ce4",
     "reverseProxy": "docker.io/nginx:1.20",
     "worker": {
-      "datasets": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-ebbff7e",
-      "firstRows": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-ebbff7e",
-      "splits": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-ebbff7e",
-      "splitsNext": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-ebbff7e"
+      "datasets": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-fff7ce4",
+      "firstRows": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-fff7ce4",
+      "splits": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-fff7ce4",
+      "splitsNext": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-fff7ce4"
     }
   }  
 }
diff --git a/services/admin/Dockerfile b/services/admin/Dockerfile
index b55bddc44e..52ad88bfe0 100644
--- a/services/admin/Dockerfile
+++ b/services/admin/Dockerfile
@@ -1,3 +1,5 @@
+# build with
+#   docker build -t some_tag_admin -f Dockerfile ../..
 FROM python:3.9.6-slim
 
 ENV PYTHONFAULTHANDLER=1 \
@@ -19,11 +21,13 @@ RUN pip install -U --no-cache-dir pip
 RUN pip install "poetry==$POETRY_VERSION"
 
 WORKDIR /src
-COPY libs ./libs/
-COPY services ./services/
-COPY tools ./tools/
+COPY libs/libcache/dist ./libs/libcache/dist
+COPY libs/libqueue/dist ./libs/libqueue/dist
+COPY libs/libutils/dist ./libs/libutils/dist
+COPY services/admin/src ./services/admin/src
+COPY services/admin/poetry.lock ./services/admin/poetry.lock
+COPY services/admin/pyproject.toml ./services/admin/pyproject.toml
 WORKDIR /src/services/admin/
 RUN poetry install
 
-ENTRYPOINT ["make"]
-CMD ["run"]
+ENTRYPOINT ["poetry", "run", "python", "src/admin/main.py"]
diff --git a/services/api/Dockerfile b/services/api/Dockerfile
index a14aec6238..98fabffe7a 100644
--- a/services/api/Dockerfile
+++ b/services/api/Dockerfile
@@ -1,3 +1,5 @@
+# build with
+#   docker build -t some_tag_api -f Dockerfile ../..
 FROM python:3.9.6-slim
 
 ENV PYTHONFAULTHANDLER=1 \
@@ -13,17 +15,19 @@ ENV PYTHONFAULTHANDLER=1 \
 
 # System deps:
 RUN apt-get update \
-    && apt-get install -y build-essential unzip wget python3-dev make \
+    && apt-get install -y build-essential unzip wget python3-dev \
     && rm -rf /var/lib/apt/lists/*
 RUN pip install -U --no-cache-dir pip
 RUN pip install "poetry==$POETRY_VERSION"
 
 WORKDIR /src
-COPY libs ./libs/
-COPY services ./services/
-COPY tools ./tools/
+COPY libs/libcache/dist ./libs/libcache/dist
+COPY libs/libqueue/dist ./libs/libqueue/dist
+COPY libs/libutils/dist ./libs/libutils/dist
+COPY services/api/src ./services/api/src
+COPY services/api/poetry.lock ./services/api/poetry.lock
+COPY services/api/pyproject.toml ./services/api/pyproject.toml
 WORKDIR /src/services/api/
 RUN poetry install
 
-ENTRYPOINT ["make"]
-CMD ["run"]
+ENTRYPOINT ["poetry", "run", "python", "src/api/main.py"]
diff --git a/services/worker/Dockerfile b/services/worker/Dockerfile
index 10df227931..7306a4c766 100644
--- a/services/worker/Dockerfile
+++ b/services/worker/Dockerfile
@@ -1,3 +1,5 @@
+# build with
+#   docker build -t some_tag_worker -f Dockerfile ../..
 FROM python:3.9.6-slim
 
 ENV PYTHONFAULTHANDLER=1 \
@@ -34,12 +36,14 @@ RUN pip install -U --no-cache-dir pip
 RUN pip install "poetry==$POETRY_VERSION"
 
 WORKDIR /src
-COPY libs ./libs/
-COPY services ./services/
-COPY tools ./tools/
+COPY libs/libcache/dist ./libs/libcache/dist
+COPY libs/libqueue/dist ./libs/libqueue/dist
+COPY libs/libutils/dist ./libs/libutils/dist
+COPY services/worker/src ./services/worker/src
+COPY services/worker/poetry.lock ./services/worker/poetry.lock
+COPY services/worker/pyproject.toml ./services/worker/pyproject.toml
 COPY vendors ./vendors/
 WORKDIR /src/services/worker/
 RUN poetry install
 
-ENTRYPOINT ["make"]
-CMD ["run"]
+ENTRYPOINT ["poetry", "run", "python", "src/worker/main.py"]