diff --git a/Dockerfile b/Dockerfile
index 733930f..8c71da4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,10 +31,13 @@ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 COPY --from=builder --chown=nextjs:nodejs /app/public ./public
 
+# Copy and set up entrypoint script
+COPY --chown=nextjs:nodejs docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+
 USER nextjs
 
 EXPOSE 3000
 
-# Use ENTRYPOINT and CMD for better container control
-ENTRYPOINT ["node"]
-CMD ["server.js"]
\ No newline at end of file
+# Use the entrypoint script
+ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100644
index 0000000..ec21c60
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# Change to app directory
+cd /app
+
+# Start the Next.js server
+echo "Starting Next.js server..."
+exec node server.js
\ No newline at end of file