diff --git a/docker/chat-api/amd64-Dockerfile b/docker/chat-api/amd64-Dockerfile
index bda29eeff8..fe6e70f084 100644
--- a/docker/chat-api/amd64-Dockerfile
+++ b/docker/chat-api/amd64-Dockerfile
@@ -1,7 +1,7 @@
 FROM treehouses/node
 
 RUN apk update ;\
-    apk add --no-cache bash curl git jq ca-certificates tree
+    apk add --no-cache bash curl git jq ca-certificates
 
 WORKDIR /usr/share/gpt-proxy
 
@@ -13,9 +13,7 @@ RUN npm install
 COPY ./gpt-proxy/src ./src/
 COPY ./gpt-proxy/tsconfig.json ./tsconfig.json
 
-RUN tree
-
 # # Build the TypeScript code
-# RUN cd gpt-proxy && npm run build
+# RUN npm run build
 
 CMD ["npm", "run", "dev"]
diff --git a/docker/chat-api/arm-Dockerfile b/docker/chat-api/arm-Dockerfile
index dca0e2573d..c8593f8fdd 100644
--- a/docker/chat-api/arm-Dockerfile
+++ b/docker/chat-api/arm-Dockerfile
@@ -11,6 +11,12 @@ FROM treehouses/node-tags:arm
 RUN apk update ;\
     apk add --no-cache bash curl git jq ca-certificates;
 
-WORKDIR /root
+WORKDIR /usr/share/gpt-proxy
 
-CMD bash ./docker-entrypoint.sh
+COPY ./gpt-proxy/package*.json ./
+RUN npm install
+
+COPY ./gpt-proxy/src ./src/
+COPY ./gpt-proxy/tsconfig.json ./tsconfig.json
+
+CMD ["npm", "run", "dev"]
diff --git a/docker/chat-api/arm64-Dockerfile b/docker/chat-api/arm64-Dockerfile
index 2be700f642..364f88abaa 100644
--- a/docker/chat-api/arm64-Dockerfile
+++ b/docker/chat-api/arm64-Dockerfile
@@ -11,6 +11,12 @@ FROM treehouses/node-tags:arm64
 RUN apk update ;\
     apk add --no-cache bash curl git jq ca-certificates;
 
-WORKDIR /root
+WORKDIR /usr/share/gpt-proxy
 
-CMD bash ./docker-entrypoint.sh
+COPY ./gpt-proxy/package*.json ./
+RUN npm install
+
+COPY ./gpt-proxy/src ./src/
+COPY ./gpt-proxy/tsconfig.json ./tsconfig.json
+
+CMD ["npm", "run", "dev"]
diff --git a/docker/planet.yml b/docker/planet.yml
index 3082a359b6..0e333c8bc8 100644
--- a/docker/planet.yml
+++ b/docker/planet.yml
@@ -11,13 +11,12 @@ services:
       - couchdb
     environment:
       - COUCHDB_HOST=http://couchdb:5984
-  # chat-api:
-  #   image: treehouses/chat-api:local
-  #   ports:
-  #     - "5000:5000"
-  #   environment:
-  #     - COUCHDB_URL=http://couchdb:5984
-  #     - OPENAI_API_KEY=$OPENAI_API_KEY
+  chat-api:
+    image: treehouses/planet:chat-api-local
+    ports:
+      - "5000:5000"
+    env_file:
+      - .chat.env
   planet:
     image: treehouses/planet:local
     ports: