diff --git a/.dockerignore b/.dockerignore
index 189c21191..bc751a07a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -35,5 +35,5 @@ rnd/autogpt_builder/node_modules
 rnd/autogpt_builder/.env.example
 rnd/autogpt_builder/.env.local
 rnd/autogpt_server/.env
-
+rnd/autogpt_server/.venv/
 
diff --git a/rnd/autogpt_server/Dockerfile b/rnd/autogpt_server/Dockerfile
index eeb954e93..ccf265ebe 100644
--- a/rnd/autogpt_server/Dockerfile
+++ b/rnd/autogpt_server/Dockerfile
@@ -32,15 +32,12 @@ COPY rnd/autogpt_libs /app/rnd/autogpt_libs
 WORKDIR /app/rnd/autogpt_server
 
 COPY rnd/autogpt_server/pyproject.toml rnd/autogpt_server/poetry.lock ./
-
 RUN poetry install --no-interaction --no-ansi
 
-COPY rnd/autogpt_server /app/rnd/autogpt_server
-
-WORKDIR /app/rnd/autogpt_server
-
+COPY rnd/autogpt_server/schema.prisma ./
 RUN poetry run prisma generate
 
+COPY rnd/autogpt_server /app/rnd/autogpt_server
 FROM server_base as server
 
 ENV PORT=8000
diff --git a/rnd/autogpt_server/Dockerfile.ws b/rnd/autogpt_server/Dockerfile.ws
index 084ff1f08..0e3e1dc86 100644
--- a/rnd/autogpt_server/Dockerfile.ws
+++ b/rnd/autogpt_server/Dockerfile.ws
@@ -32,15 +32,14 @@ COPY rnd/autogpt_libs /app/rnd/autogpt_libs
 WORKDIR /app/rnd/autogpt_server
 
 COPY rnd/autogpt_server/pyproject.toml rnd/autogpt_server/poetry.lock ./
-
 RUN poetry install --no-interaction --no-ansi
 
-COPY rnd/autogpt_server /app/rnd/autogpt_server
-
-WORKDIR /app/rnd/autogpt_server
-
+COPY rnd/autogpt_server/schema.prisma ./
 RUN poetry run prisma generate
 
+COPY rnd/autogpt_server /app/rnd/autogpt_server
+FROM server_base as server
+
 FROM server_base as server
 
 ENV PORT=8001