diff --git a/deploy/docker-compose-prod-full-stack.yml b/deploy/docker-compose-prod-full-stack.yml
index 8683b5f..1d4d1b5 100644
--- a/deploy/docker-compose-prod-full-stack.yml
+++ b/deploy/docker-compose-prod-full-stack.yml
@@ -42,7 +42,7 @@ services:
     env_file:
       - ./prod.env
     healthcheck:
-        test: kill -0 1
+        test: ps -ef | grep rake | grep ruby
     command: bundle exec rake jobs:work RAILS_ENV=production
 
 
diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml
index d58339f..5c8247e 100644
--- a/deploy/docker-compose-test.yml
+++ b/deploy/docker-compose-test.yml
@@ -82,7 +82,7 @@ services:
       caching:
     restart: always
     healthcheck:
-        test: kill -0 1
+        test: ps -ef | grep rake | grep ruby
     command: bundle exec rake jobs:work RAILS_ENV=production
     deploy:
       resources:
diff --git a/deploy/rails-prod-Dockerfile b/deploy/rails-prod-Dockerfile
index 902858f..c27b3b1 100644
--- a/deploy/rails-prod-Dockerfile
+++ b/deploy/rails-prod-Dockerfile
@@ -2,6 +2,10 @@ FROM ruby:2.4.4
 
 HEALTHCHECK --start-period=30s CMD curl --insecure https://127.0.0.1/
 
+ENV TINI_VERSION v0.18.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+
 RUN apt-get -qq update \
   && DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade -y \
   && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
@@ -68,7 +72,10 @@ ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e446
 ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
 RUN RAILS_ENV=production bundle exec rake assets:precompile
 
+# Tini solves the zombie PID problem
+ENTRYPOINT ["/tini", "--"]
+
 # By default, simply start puma.
 WORKDIR /rails
-CMD bundle exec puma -t 3:3 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt'  -e production
-#CMD bundle exec passenger start -p 443 --max-pool-size 3 --environment production --ssl --ssl-certificate /ssl/server.crt --ssl-certificate-key /ssl/server.key
\ No newline at end of file
+#CMD bundle exec puma -t 3:3 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt'  -e production
+CMD bundle exec passenger start -p 443 --max-pool-size 3 --environment production --ssl --ssl-certificate /ssl/server.crt --ssl-certificate-key /ssl/server.key
\ No newline at end of file