diff --git a/config/puma.rb b/config/puma.rb
index 8f35991..485c840 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1 +1,5 @@
 ENV["PUMA_PID"] = Process.pid.to_s
+
+port ENV.fetch("PORT", 4567)
+
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]
diff --git a/dockerfiles/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile
index 95bc176..2e6da3a 100644
--- a/dockerfiles/alpine.Dockerfile
+++ b/dockerfiles/alpine.Dockerfile
@@ -39,5 +39,5 @@ COPY --from=build --chown=app:app /app /app
 
 COPY --chown=app:app . .
 
-EXPOSE 4567
-CMD [ "puma", "--bind", "0.0.0.0", "--port", "$PORT" ]
+EXPOSE $PORT
+CMD [ "puma" ]
diff --git a/dockerfiles/bookworm.Dockerfile b/dockerfiles/bookworm.Dockerfile
index da64752..c28decc 100644
--- a/dockerfiles/bookworm.Dockerfile
+++ b/dockerfiles/bookworm.Dockerfile
@@ -40,5 +40,5 @@ COPY --from=build --chown=app:app /app /app
 
 COPY --chown=app:app . .
 
-EXPOSE 4567
-CMD [ "puma", "--bind", "0.0.0.0", "--port", "$PORT" ]
+EXPOSE $PORT
+CMD [ "puma" ]