diff --git a/src/puppeteer/Dockerfile b/src/puppeteer/Dockerfile
index d3b250b1..082b250d 100644
--- a/src/puppeteer/Dockerfile
+++ b/src/puppeteer/Dockerfile
@@ -23,5 +23,4 @@ WORKDIR /project
 
 RUN npm install
 
-CMD ["node", "dist/index.js"]
-
+ENTRYPOINT ["node", "dist/index.js"]
\ No newline at end of file
diff --git a/src/puppeteer/index.ts b/src/puppeteer/index.ts
index b82c653a..713f7626 100644
--- a/src/puppeteer/index.ts
+++ b/src/puppeteer/index.ts
@@ -401,3 +401,8 @@ async function runServer() {
 }
 
 runServer().catch(console.error);
+
+process.stdin.on("close", () => {
+  console.error("Puppeteer MCP Server closed");
+  process.exit(1);
+});