diff --git a/config/application.yml b/config/application.yml
index a73510c..b11f765 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -12,3 +12,6 @@ SENTRY_JS_ENABLED: "<%= Rails.application.credentials.SENTRY_JS_ENABLED || true
 RECAPTCHA_ENABLED:  '<%= Rails.application.credentials.RECAPTCHA_ENABLED %>'
 
 RAILS_SERVE_STATIC_FILES: '<%= Rails.application.credentials.RAILS_SERVE_STATIC_FILES || true %>'
+
+HEALTHCHECK_AUTH: '<%= Rails.application.credentials.HEALTHCHECK_AUTH || true %>'
+HEALTHCHECK_SSL: '<%= Rails.application.credentials.HEALTHCHECK_SSL || false %>'
diff --git a/config/credentials/development.yml.enc b/config/credentials/development.yml.enc
index 14fdbf6..64cb4fe 100644
--- a/config/credentials/development.yml.enc
+++ b/config/credentials/development.yml.enc
@@ -1 +1 @@
-k26YtTX/JTSRwZz4u5qF6/i2U7Sts2QZp62c9HNja9jaCA9H+ES/PkvCguJ/aavieJqpKNdQ8C/eiBZPTHfkQrPNCbv6ztALK9tg8VBifCwo5OAutAr/tYQ7HiykQWkU0syXWehafxx5e8IJ12WpP130V9J5XvxCA58pijVjU+810ATvBgTwTl+cfjs1GpovQFeLhEXNaKzaxRcfuRNOPLq4WJ0TQ5bAeZuSo40Sx8FL3Tx/j7TPMGD47YjePIyi4I9XEzxELTkBdoRv2nfWpZ1Ade0nLtaX7U96KpKR46LkGyIwaNDqIykT8h36sMUJUrmJSzCY9iTlIT+wXt1PVDGuun1sK5NuA3dFZ66xm1n/GR0WXS7O0Nj8zmPBud6kZpA21iYSJDV2EslSm+09vth1kG3CvzXoP3nQnmq2EYpR2KykrxRNZciL9qkDWcYtMM3MgQgH5Md/2eo+afIGgMnTHpbLWZKW+KlQ5n9HEtCDTMwHIu/hrRa0IRFJFuPP0WrZqmZyAYoDLFrC2ct61wLXNjw0ty6kC9/VbKDruPuEZQZKxcLwM7q8j61b/67f3PCCdc3LQ62c0Cj6ee7vgGKqzV0Bv/Tgz1o3J8Tg7O952Z44wWQ2eyZHzmz7wG5+xk3yYf5p1c9PHa5G3+6XfQP9Q1eMQPfTEQsb6GQeG7G2t0OJs9rYEwhI9PtfIF3EUAmORsfBznbXNWsuchG2zOViDsq3iEBmW+3foewpWQZ11gnz+DV9BTyrbpBsZk8LEMgiRho2YKK0F8zREaJ96VubX0rxDRdI5YPFP0mcXiBs83CoKW8CgHhb--ObRYoWt2iH3wY4Yl--wJJvsuj3UudObCM5DwFbQw==
\ No newline at end of file
+rSe24G2PIIIJBVHvF3YOt9xPwScHs9eXI/+ZuulsNx/ggA8bI6x3evvHXPMcZ67eQuRCeJiphsn2bgmlNdKibFMPb/7V0QNb7EIjxRzNJ7UHGCJShq9XNMe0HdztasfevI16gwdXqXs1L8WmmgctqW6EvaZkp9P5yRg31/5zRPDe5j8yj+FQe0YXK/uwjUgwZD4uBj+Fnn0xMLBmMaZjpnkwpi5rLlhTkMRD+Qzh+9CQO1BPFrPYGniX49ms6Pb1Z/aOsxzmaiPfLCdy9dTSDmGzpKecURzfWVH15IKKdMXrRA1izbPFF6n7fP15lrzktZZjnPWC3XiazgtRwhAeu/UPhi5h6saRkBLjKOLOvBn/bHohyVsSDDmUWDYlP/ldnVUiDnbVKH7dn6XFRauCJni3415ThekM/9lUe/DyfG6dsFE1xiJRqM8JcFiG0ZICp3rJ3jxti+m/5RNzHkj7Lt9mpDJaFmTZARDNLj6ffvMcr5LSS7Uhg9OiVcdhRXidxID4aXyKObeEMqcz1MQAB1Evf7m3Z89QIYNG1uUEhqJSYpPiaS5UBNTnk//K0uwXgXfQfjC8RuyD5XmMIqrBt21L6OizG6ZRYdglJcO1n5nYG0uGIToJpRANMI9y3yY5BCKtGiz2hxckLlyBDaRI5WR5ZvdQJ2B5PWlw73I5kW/wSUwj/axkBCMnj6A/CbsS/CbCOyn1F1y04HS7yVelvh0SSNmtL39jo7N3U9ZTwdMTfIjsZ+JUwXS7zfT4uoQeqO4G6QFhwrhPVe23sKtgSQrJzRToMEFrKpkd/C6bBOD6uPl54xaL5UrTbARQ6K65GqeIQplRZWjexFTc4HhJ956v3ifvRBmS1IlthtAhaw9ccOYYX7+PODna8wAoW1EzeMr5kg==--gHSpJ3qaiDI5tRLX--UaqBiXtW4JcCM+Sti4rIRA==
\ No newline at end of file
diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
index bd20117..a413ac6 100644
--- a/config/credentials/production.yml.enc
+++ b/config/credentials/production.yml.enc
@@ -1 +1 @@
-RHVE24irVZERt12NIvtMlOeD5gI2i1lkMewJJxBlAgGsXD8Ms55jNTcqKV0jUHk30xxq1wiDIfEfeCK//XwzSQtdhPkHUETFRMtKlmw0rqVTws9wVklbrmime5iDvuOf38vInbZVAcFU21s+zUf+Du42KMIGlVb3/dlIS2u2e1xw5KNJQOCIfKoe++H9bPOtFerhhDYUmRYJe+tMOQLyTUu0K+2ffg+a49ff35FKJqTpCPL5Vu3uD38pGtDhKhxCiUPwKFqpHP3i7gEi34QpzkaD3Vktu9pRtbiPxeqM8snxWBQsxgsRsdKJwOuEUoj2qw5oxHKhYI/jVaitBRvwYPZTtbrvSEym9D9roaI+DR8SHE39MAh1xU73sRTgrDz2o5FWPJoijdczI63j+AOza3ZbqfuDEagjqGdCDbXCfr3gi8d9GcM60gGBDkWhr1h0CxWV6jzLcU7yA8dTuSL8nFdd17zsN5C9ZgxxvUZ3ilnbOYPwdcZP0/9ekprq2cIQ58CaLsu69sixd2UnUwtyC4zx90FGhiA3kVFyJeahTbUOKL14RK6BhaMUuz15tz98HtCO+Is9uraWryPNVX2l6m/Q3wQfrOWai/8v8HKevqdmzMJvivAy5fPtsR2kJkvECPK0Io1a5IHv434gw5f7PcGzlGOEk3XArA7XxeyNmLK7wzGW74Topvi+Zqtk25JqE7Z4Nkkv4y4o4ctkvBRj2ExzZg21wQD9giLaANcb8Hj+sk0HNOgRbZ13aOepHiJX2lMGsS7x2PBpk56B3qMogxrEbdNgQdxXXBtW1HNeyc+z9kZRgsHyRxDDG+9glj9FdUmDBobbdxigvLaWAFIBCDIlKIH3Rtv/MAz/0lnE9PSPqn13QfC8KMyI3RzpNcR6NrKxZiLWMEy6Oex220hQOFfbepHLNkLIUm9IKqysdYwa32anKvyg34YQ6vE7XEEui1L4aKWNq2Vb7CSF1JreJSB21zW8FC5uSh3QD/AKPWAyF7reVIBIjW7VsApEL6R8s2ou0RBkIMyhtXyDDUOzez6GEu4caUeSNOCjp4vsSZwXEzBSOz0rzCVyJPMBGiIsaMGDZ02vbBwSVDVV/rhzCuVpBKEiMcjzDFc9QHwhD7gCy1mtvP6gQmWLUiDP9Y+8A6okKcxB6gDAKHzdJXGAJGYnktqGdHMYpQ0feE0N+umG7wyEaBW0YJAIQYR6KR8OSMy+6Rg43iQRXXiOgBcU0uIQa7JyVQdysQX4fhW1UZII4Syu65tfi75NETpqWbDxnp6xvw7LpQ==--a6ISTZpt8qbI/E2O--VsALKCGxTmuK5s0bBfOhog==
\ No newline at end of file
+kAdrOTYPweXMtpkM+D3A6LS5wWVusnrJfwnDnnqo8Txga/Xqo3GwPrkjWWOTS8T4Ct0q2lEPHDyV0XB2geT/ichbiu0/EtqgJ8pfhpfnvsCX1uLaduYZ6e+VLGjWpqkr3Yz/KCRARN8Bje/Rrqs8G0WulTdvZAIIaITM9+RSOA5jSBQEEI31I1RFP5NGDBQo+mTUOIk5Kxn7YkccgPIDBvegttSbLD54l31ubXRNk65a7bXUuzOPNzcWHYjPO7f4+SFOY2hpSnJjWLlJodsLdO/tZL9iqGUb4rCdvJcnjgV0FEmwWMnRtM1khX9S6doyMKjXmXBmMUtOUZ+HBfNVFh91iNXHEndI2kGnCCNWyNKO/AMKLSMKdz14iLWvcIEjsppFKaEImWfZfxh4L4XxAzjppdFxj0LQCTzZ4ctHPGnl2mco9l9ZpD7hMcqgCQyR1cDI2JMn6MffuqZKXMqVeAGAqO5dP3nioA18fmgw7B7fEelu4FI637IlD/4C3mFS/+z6U14Ixu+W8RjOmFBCi04ngQ3RJxxq1YFk9PUxVv1t0nNbTRSDoV/fNgDPhsuzYBdXIpVmD7ic4pbyJohO46EPCMOO+DixBYeintVaCMcFZaKbnOZauUIbiDi1t7V7X+42v8O8Jaq9H418q/UQUDgaSa8RSXq9IWLn/Hrgg5JnjclNwFQ+s6Xq294sc2KkpQOGDAue8dlC8Ets3OTHyik3w4YibRdyfSk1eEMf4Y5XWgpVC0j+1Av5qaXdgC7B8T+iJBQ059WFS3509ofeKfgCAVf6PZ7yb/iJDX6oUZCNZKDz7l6phlwcEbNCU9loqN7XVgLso8jraziuqxLncMcAXehXhpCpRXElcnBRnkxzhGq5XPAKTY8TvwUQRu0A/xImTAtb5XjLfumI+ytmbYvkENhtetp/bCp76ndao8a0ct0ZqUcgHS0pE0b1nPR5lQDCHsCKfXP3AsmTD9V2CTTiqsJim7KEf1tDm8Ug9mVuvf/RX6iEjV/NjMolLggu7Y407bIlhwtgIvuiqRjT9kQsHdCdAiWW8D8pI4p5QY2Z7/6tAYOhbcn3BcJ1ovn4sQqMan+oBSWr6Wufcn9UrbzO0eBAHLtuYwB3myHhV/CGnVQBvTLmglzGBayEd41jRA/FJqBKDZ4cJUClaGPhFH3B3s9GbEWLE8phYzLcChE12MLhp4AojBTnPhhFMbag1d2FtEbA4gYprGQeN+pU7eiHrOK02aNz5y9vEJJL8Y42P7UZI737DdyYRleiDK9DEONSDQ7sE3i0KFHrYth1v7i/XrpN1nCdRfVpRotv0r89Y3AMqS+peBK++DYab8xkid9ec0VUfhXG0AZeQmqZySrYhfL7vUwV8lgCDw==--UPKwflZiWNSmdmYT--0VnZK0HylhMCbKeV/2p7fw==
\ No newline at end of file
diff --git a/config/initializers/okcomputer.rb b/config/initializers/okcomputer.rb
new file mode 100644
index 0000000..e2ef57f
--- /dev/null
+++ b/config/initializers/okcomputer.rb
@@ -0,0 +1,14 @@
+OkComputer.mount_at = "health"
+OkComputer.require_authentication(*ENV["HEALTHCHECK_AUTH"].to_s.split(":")) if ENV["HEALTHCHECK_AUTH"].present?
+
+OkComputer::OkComputerController.class_eval do
+  force_ssl except: :index if ENV["HEALTHCHECK_SSL"] == true
+end
+
+OkComputer::Registry.register "solr", OkComputer::SolrCheck.new(ENV["SOLR_URL"])
+OkComputer::Registry.register "redis", OkComputer::RedisCheck.new(url: ENV["REDIS_URL"])
+
+if ActionMailer::Base.smtp_settings[:address].present?
+  OkComputer::Registry.register "mailer", OkComputer::ActionMailerCheck.new(ActionMailer::Base)
+  OkComputer.make_optional %w(mailer)
+end