diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a34818a8..dfbd68db 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,21 +1,22 @@
-### Issue link / number:
+### Resolves #enter-issue-number
 
-### What changes did you make?
+### What changes did you make and why did you make them?
 
-### Why did you make the changes?
+### Did you run tests? Share screenshot of results:
 
-### Did you run tests?
+### How did you find us? (GitHub, Google search, social media, etc.):
 
-<!---IMPORTANT NOTE ABOUT RUNNING TESTS: ->
+<!---ABOUT RUNNING TESTS :->
+- Directions for running tests are in the README.md.
+- Tests are not required to pass. 
+- Run unit tests
+- Run integration tests if required for contribution.
 - Some tests may require multiple runs before success.
-- Some test failures may not be due to your contribution and can be ignored.
-- If tests fail without resolution, please let us know here.
-- Directions for running tests are in the README.md 
+- Some test failures may not be due to your contribution and can be ignored. We are always upgrading testing performance.
 
-<!--- PR CHECKLIST: PLEASE REMOVE BEFORE SUBMITTING —>
+<!--- PR CHECKLIST: —>
 Before submitting, check that you have completed the following tasks:
 - [ ] Answered the questions above.
-- [ ] Read Chayn's Contributing Guidelines in the CONTRIBUTING.md file.
 - [ ] Enabled "Allow edits and access to secrets by maintainers" on this PR.
 - [ ] If applicable, include images in the description.
 After submitting, please be available for discussion. Thank you!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1720ca33..2ad062a4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,66 +2,50 @@
 
 Thank you for taking the time to contribute!
 
-We ❤️ our contributors and strive to give back more than we get. Have feedback on how we can improve? Questions, insight, or other concerns? We invite you to share in our [this anonymous form](https://forms.gle/v2whmf4XX3du4Y3t9).
+Have feedback on how we can improve? Questions, insight, or other concerns? We invite you to share in our [this anonymous form](https://forms.gle/v2whmf4XX3du4Y3t9).
 
-Do you want to make a greater impact with Chayn and receive special access to our organization and volunteer opportunities? Please visit our [visit our Getting Involved Guide](https://www.chayn.co/get-involved) to get started! Don't forget to star this repository ⭐ so we can find more contributors like you!
+## Support Our Work
 
-# Table of Contents
+Chayn is proudly open-source and built with volunteer contributions. We are grateful for the generosity of the open-source community and aim to provide a fulfilling experience for open-source developers.
 
-- [Prerequisites](#prerequisites)
-- [Where Can I Get Help?](#where-can-i-get-help)
-- [What kind of contributions does Chayn want?](#what-kind-of-contributions-does-chayn-want)
-- [Chayn's Spam Policy](#chayns-spam-contribution-policy-)
-- [The Contribution Process Guide:](#the-contribution-process-guide)
-  1. [Read the README and Code of Conduct](#1-read-the-readme-and-code-of-conduct)
-  2. [Claim an Issue](#2-claim-an-issue)
-  3. [Fork the Repo and Create a New Branch](#3-fork-the-repo-and-create-a-new-branch)
-  4. [Commit Changes Using Open-Source Standards](#4-commit-changes-using-open-source-standards)
-  5. [Sync Fork if Needed](#5-sync-your-fork-if-needed)
-  6. [Push Changes to GitHub](#6-push-changes-to-github)
-  7. [Make a Pull Request to Chayn](#7--make-a-pull-request-to-chayn)
+**Please give this repository a star ⭐ and follow our GitHub profile 🙏 to help us grow our open-source community and find more contributors like you!**
+
+Support our mission further by [sponsoring us on GitHub](https://github.com/sponsors/chaynHQ), exploring our [volunteer programs](https://www.chayn.co/get-involved), and following Chayn on social media: - Linktree: [https://linktr.ee/chayn](https://linktr.ee/chayn) - Twitter: [@chaynhq](https://twitter.com/ChaynHQ) - Instagram: [@chaynhq](https://www.instagram.com/chaynhq/) - Youtube: [@chaynhq](https://www.youtube.com/@chaynhq) - Facebook: [@chayn](https://www.facebook.com/chayn) - LinkedIn: [@chayn](https://www.linkedin.com/company/chayn).
 
 # Prerequisites
 
-If you are new to GitHub and git version control, here are some resources to help you get started:
+- Git version control
+- a GitHub account
+
+**Additional Guidance:**
 
 - [Getting Started with First Time Git Setup](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup)
 - [Learn the GitHub Flow](https://docs.github.com/en/get-started/quickstart/github-flow)
 - [Git Basic Branching & Merging Guide](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
 - [How to Collaborate with Pull Requests](https://docs.github.com/en/github/collaborating-with-pull-requests)
-- [Git Cheatsheet](https://education.github.com/git-cheat-sheet-education.pdf) _(we highly recommend saving this for future reference!)_
-
-Here are prerequisites you should meet before contributing to Chayn's GitHub:
-
-- git version control configuration
-- a GitHub account
-- fundamental knowledge of the GitHub and git version control flow (fork, clone, push, commit, branches, etc.)
+- [Git Cheatsheet](https://education.github.com/git-cheat-sheet-education.pdf) _(we highly recommend)_
 
-**It is not required that you have experience contributing to open-source projects on GitHub!** Chayn aims to be a safe space for contributors of all skill-levels to build their skills while making an impact in digital public goods. If this is your first contribution, we recommend saving the cheatsheet linked above for future reference, learning how to navigate the GitHub and git version control docs, and in general -- _learn as you go._ The Chayn team is here to help. You got this! 💪
+**Previous open-source experience not required.** If this is your first contribution, we recommend saving the cheatsheet linked above for future reference, learning how to navigate the GitHub and git version control docs, and in general -- _learn as you go._ Happy coding! 💪
 
 # Where can I get help?
 
-Chayn maintainers and developers are here to help! We aim to give a safe space for contributors of all skill levels to build their skills while making an impact. 🤝
-
 You can ask Chayn team members questions at any point during your contribution in the following places on GitHub:
 
 - Issue discussions in an issue you're assigned to or interested in.
 - Pull request discussions for your contribution.
 - Or, create a new issue with the `type: question / suggestion` label.
 
-Chayn team members usually respond within 3 business days.
-
 # What kind of contributions does Chayn want?
 
 Chayn is open to all kinds of contributions, such as:
 
 - additional software tests / test coverage
-- dependency updates *check Dependabot pull requests 
+- dependency updates \*check Dependabot pull requests
 - code (requested features, bug fixes, quality enhancements, maintenance help)
 - accessibility and language support.
 - no-code (documentation, translations) \*see spam policy below for accepted documentation changes.
 
-# Chayn's Spam Contribution Policy 🚫
+# Chayn's Spam Policy 🚫
 
 **Chayn will reject contributor pull requests if they are defined as spam or not associated with an issue.**
 All pull requests need to be associated with an issue. If you open a pull request without claiming an issue, you will be asked to create an issue for your pull request.
@@ -75,6 +59,22 @@ Documentation contributions will only be accepted under these circumstances:
 
 Unwanted documentation changes, such as summarizations, white space edits, or minor grammatical edits will be DENIED (unless there is evidence provided that these changes are for accessibility).
 
+# Issue Policies
+
+### Issue Limit Policy:
+
+To ensure we give a fair opportunity to everyone, Chayn maintainers may limit the number of issues you can be assigned. This allows us to manage our open-source contributions at a sustainable pace and ensure there are always open issues for everyone.
+
+- **Only 1 issue of a specific complexity level in a single repository may be assigned to a contributor at a time.** To be assigned another, you must complete or close your previous issue. For example, a contributor can have 1 beginner issue, 1 intermediate issue, and 1 complex issue open in a single repository at a time. But they cannot have 3 beginner issues open, or 2 intermediate issues open at once in a single repository.
+- **Beginner issues may be capped** at any time to reserve for current events, such as volunteer programs or Hacktoberfest.
+
+### Abandoned Contribution Policy:
+
+We understand that life happens! If you can no longer finish a contribution, please comment to let us know so we can swiftly reassign.
+
+- After 60 days of no activity, your issue or pull request will be labeled `stale` and you will be prompted to respond in the discussions.
+- If there is no response, we will unassign the issue and close your pull request.
+
 # The Contribution Process Guide
 
 ### Directions for Contributing to Chayn:
@@ -93,62 +93,35 @@ First, read the project's [README](/README.md) for project-specific directions o
 
 Contributing means you have agreed to our [Code of Conduct](/CODE_OF_CONDUCT.md).
 
-**Note: For no-code contributors,** if you are editing the `README` file or any other markdown / text files, it is NOT required to set up environment variables, run the app locally, and pass tests. You can make your changes entirely in the GitHub UI (in the web browser) after forking the Chayn repository you are working on and creating a new feature branch.
-
 ## 2. **Claim an Issue:**
 
 To claim an issue, either create an issue to be assigned to OR ask to be assigned an existing issue.
 
 - If multiple people ask to be assigned before a Chayn maintainer can respond, the person who asked first will be assigned.
 
-- Multiple people are welcome to collaborate on a single issue.
-
-**Important!: All pull requests MUST be associated with a claimed issue. We may deny your pull request if it is not associated with an issue that you're assigned to. Please make sure you are assigned an issue BEFORE making your contribution.**
+- Multiple people are allowed to collaborate on a single issue.
 
 ### Create Issue:
 
 Have an idea for a contribution? Create your own!
 For more guidance see [GitHub Docs: Creating an Issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-an-issue).
 
-Steps to create an issue to be assigned to:
-
-1. Check that your issue doesn't already exist.
-2. Follow our issue templates for creating new issues.
-3. If your issue is complex, consider breaking it into multiple smaller issues.
-4. Ask to be assigned your issue in the discussion.
-
-See [What kind of contributions does Chayn want?](#what-kind-of-contributions-does-chayn-want) for contribution ideas.
-
 ### Claim Existing Issue:
 
-To claim an existing issue, comment in the discussions and ask to be assigned. Ideally you should tag the issue author / Chayn team member.
+To claim an existing issue, comment in the discussions tag the issue author / Chayn team member to be assigned.
 
 ### How to Select Issues:
 
-Scan our issue `labels` to find issues that suit you:
+Scan our issue labels to find issues that suit you:
 
-- The `good first issue` and `first-timers-friendly` labels are best for new contributors.
-- The `help wanted` label indicates that Chayn is inviting contributors to help. While contributors can contribute to any unassigned issue, issues with this label are specifically looking for help outside of Chayn's dev team.
-- The `complexity: beginner` label is for issues that take less than 1 day to complete, and require little to no prior experience with the codebase.
-- The `complexity: moderate` label is for issues that may take 1-2 days to complete, and will require some knowledge of the codebase.
-- The `complexity: advanced` is for issues that may take more time, possibly 3+ days. These will require more in-depth knowledge of the codebase. **Contributors are strongly encouraged to report progress while working on complex issues.**
+- `good first issue` and `first-timers-friendly` labels are best for new contributors.
+- `help wanted` label indicates that Chayn is inviting contributors to help. While contributors can contribute to any unassigned issue, issues with this label are specifically looking for help outside of Chayn's dev team.
+- `complexity: beginner` label is for issues that take less than 1 day to complete, and require little to no prior experience with the codebase.
+- `complexity: moderate` label is for issues that may take 1-2 days to complete, and will require some knowledge of the codebase.
+- `complexity: advanced` is for issues that may take more time, possibly 3+ days. These will require more in-depth knowledge of the codebase. **Contributors are strongly encouraged to report progress while working on complex issues.**
 
 We suggest starting with issues labeled `good first issue` or `complexity: beginner` to get comfortable with the codebase before moving onto more complex issues.
 
-### Issue Limit Policies
-
-**To ensure we give a fair opportunity to everyone, Chayn maintainers may limit the number of issues you can be assigned.** This allows us to manage our open-source contributions at a sustainable pace and ensure there are always open issues for everyone.
-
-- **Only 1 issue of a specific complexity level in a single repository may be assigned to a contributor at a time.** To be assigned another, you must complete or close your previous issue. For example, a contributor can have 1 beginner issue, 1 intermediate issue, and 1 complex issue open in a single repository at a time. But they cannot have 3 beginner issues open, or 2 intermediate issues open at once in a single repository.
-- **Issues may be capped at any time** and for any reason, such as reserving for events like volunteer programs or Hacktoberfest. 
-
-### Abandoned Contribution Policy:
-
-We understand that life happens! **If you can no longer finish a contribution, please comment to let us know so we can swiftly reassign.**
-
-- After 60 days of no activity, your issue or pull request will be labeled `stale` and you will be prompted to respond in the discussions.
-- If there is no response, we will unassign the issue and close your pull request.
-
 ## 3. **Fork the Repo and Create a New Branch:**
 
 First, read the **Git Flow and Deployment** section in your project's `README` file to learn of any project-specific requirements. Generally, the git flow is the same among all repositories, however, each project may slightly vary.
@@ -204,8 +177,6 @@ Whether you are a beginner developer or experienced, we recommend all contributo
 3. **Run linters** to properly format your code before making commits. Directions for running linters are in the repository's `README` file.
 4. **Run tests and check that they pass.** Directions for running tests are in the repository's `README` file.
 
-   **Important Note about Tests:** We are currently making upgrades to our products performances. Therefore, some tests may need to be ran multiple times before they pass, and some may not pass at all. We recommend frequently running tests as you make code changes, then at your own discretion, deciding which tests fail due to your code changes, and fixing them so that they pass. Please reach out to Chayn staff in issue discussions if you encounter any issues with tests. Thank you for your patience!
-
 5. **Check that no secrets (sensitive API keys and environment variables) and no unwanted, irrelevant files are commited.** Everything you commit to Chayn will be public, please be vigilant about not commiting sensitive information. Be sure to update `.gitignore` as needed, making sure to clean the `.gitignore` cache whenever new files are added to it. Learn more about properly using the `.gitignore` file to ignore specific files in this GitHub guide: [Ignoring Files Guide](https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files).
 
 6. **Write readable commit messages** as demonstrated below:
@@ -243,8 +214,6 @@ Fix bug preventing users from submitting the subscribe form
 fixed bug on landing page
 ```
 
-**Note: While following these directions perfectly is not expected, Chayn maintainers may ask you to implement these standards during your pull request review.**
-
 ## 5. **Sync Your Fork if Needed:**
 
 If the default branch of the Chayn repository you forked from has been updated (referred to as the "upstream repository"), it is recommended to keep your forked repository up to date with these changes.
@@ -255,32 +224,26 @@ Navigate to the GitHub UI (in the web browser) and view your forked repository,
 
 ### How Do I Update my Fork?
 
-**We highly recommend referring to this guide in GitHub's docs on how to sync your fork: [GitHub Docs: Syncing Your Fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork).** You can sync your fork using the GitHub UI (web browser), command line, or GitHub's CLI by following the directions in the GitHub Docs.
-
-In addition to following the guide linked above, always make sure that your default branch is up-to-date first _before_ your feature branch. After syncing your default branch with the upstream, then **merge** those updates into your feature branch.
-
-Next, verify that the git history on your feature branch is correctly synced with the upstream. One way to do this is to use the `git log` command to check commit history. In your feature branch history, you should see the updated commits pulled from upstream, then your new commits, followed by a merge commit.
+**We recommend this GitHub guide on how to sync your fork: [GitHub Docs: Syncing Your Fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork).** You can sync your fork using the GitHub UI (web browser), command line, or GitHub's CLI by following the directions in the GitHub Docs.
 
-Finally, please resolve any merge conflicts by manually editing the conflicting files and deciding how the conflicting changes should be merged. You can refer to the resources linked below for more guidance on how to handle merge conflicts.
+We recommend making sure that your default branch is up-to-date first _before_ your feature branch. After syncing your default branch with the upstream, then **merge** those updates into your feature branch. Next, verify the git history on your feature branch is correctly synced with the upstream. One way to do this is to use the `git log` command to check commit history. In your feature branch history, you should see the updated commits pulled from upstream, then your new commits, followed by a merge commit. Finally, please resolve any **merge conflicts** by manually editing the conflicting files and deciding how the conflicting changes should be merged.
 
-**For more guidance on updating forks, read the following guides:**
+**Additional Guidance:**
 
 - [GitHub Docs: About Merge Methods](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github)
 - [GitHub Docs: Resolving Merge Conflicts on GitHub](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github)
 - [GitHub Docs: Configuring a Remote Repo for a Fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork)
 - [FreeCodeCamp: How to Sync Your Fork with the Original Git Repo](https://www.freecodecamp.org/news/how-to-sync-your-fork-with-the-original-git-repository/)
 
-**Note: We understand merge conflicts can feel scary for new devs! While we encourage contributors to update their forks prior to pull request, please do not hesitate to submit a pull request despite fork syncing issues or merge conflicts. If you have any questions or concerns, please let Chayn maintainers know in GitHub. Chayn maintainers are here to help!**
-
 ## 6. **Push Changes to GitHub:**
 
 **Before pushing changes to GitHub, please check that you have followed the standards listed in the [Commit Changes Using Open-Source Standards](#4-commit-changes-using-open-source-standards) section of this document.**
 
-In addition to following the best practices listed here, we ask that you **carefully ensure** that there are **no secrets and unwanted files being pushed.**
+We ask that you **carefully ensure** that there are **no secrets and unwanted files being pushed.**
 
 We recommend using the `git status` command to verify that the right files are being pushed.
 
-**For more guidance on pushing changes to GitHub, read the following guides:**
+**Additional Guidance:**
 
 - [Git Docs: git-status command](https://git-scm.com/docs/git-status)
 - [Git Docs: git push command](https://github.com/git-guides/git-push)
@@ -290,8 +253,6 @@ We recommend using the `git status` command to verify that the right files are b
 
 For a more in-depth guide on creating pull requests, please refer to this guide in the GitHub Docs: [Creating a Pull Request Guide](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request). We recommend opening a pull request in the GitHub UI (GitHub in the web browser.)
 
-**Important Note: Check that you are forking against the correct default branch in the upstream Chayn repository. While GitHub _should_ automatically fork against the default branch, if the default branch is not called `main` (some Chayn repositories use the `develop` branch as the default), GitHub is known to accidentally fork against main instead of the correct default branch. However, this is not a common issue.**
-
 **Next, complete the tasklist in the pull request template.** This is a brief tasklist that is only viewable when creating a pull request.
 
 Finally, submit your pull request, and be available for discussions that may arise and to make [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) that may be required before merging.
diff --git a/README.md b/README.md
index ef07a688..a2631ddc 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,28 @@
-# Welcome to Bloom
+# Bloom by Chayn
 
 [![Bloom Backend CI Pipeline](https://github.com/chaynHQ/bloom-backend/actions/workflows/.ci.yml/badge.svg)](https://github.com/chaynHQ/bloom-backend/actions/workflows/.ci.yml)
 
-**Currently in active development.**
+Bloom is a remote trauma support service from [Chayn](https://www.chayn.co/about), a global, award-winning charity designing open-source tools to support the healing of survivors across the world. Since 2013, Chayn has reached over 500,000 survivors worldwide with our trauma-informed, survivor-centred, and intersectional approaches in utilizing tech for social impact. Bloom is our flagship product; a free, web-based, secure support service designed to aid in the healing of survivors. Through a combination of online video-based courses, anonymous interaction, and 1:1 chat, Bloom provides tailored information, self-help guidance, everyday tools, and comfort to cope with traumatic events.
 
-Bloom is a remote trauma support service from Chayn, a global charity supporting survivors of abuse across borders. Bloom is our flagship product; a free, web-based support service designed for anyone who has experienced or is currently experiencing domestic or sexual abuse. Through a combination of online video-based courses, anonymous interaction and 1:1 chat, Bloom aims to provide tailored information, guidance, everyday tools, and comforting words to cope with traumatic events. 💖
+Explore Chayn's [website](https://www.chayn.co/about), [research](https://org.chayn.co/research), [resources](https://www.chayn.co/resources), [projects](https://org.chayn.co/projects), [impact](https://org.chayn.co/impact), and [support services directory](https://www.chayn.co/global-directory). 💖
 
-## Get Involved
+## Support Our Work
 
-Do you want to make an impact with Chayn and receive special access to our organization and volunteer opportunities? Please visit our [Getting Involved Guide](https://www.chayn.co/get-involved) to get started!
+Chayn is proudly open-source and built with volunteer contributions. We are grateful for the generosity of the open-source community and aim to provide a fulfilling experience for open-source developers.
 
-Other ways you can support Chayn are [donating](https://www.paypal.me/chaynhq), starring this repository ⭐ (so we can find more contributors like you!), making an open-source contribution, and supporting us on social media!
+**Please give this repository a star ⭐ and follow our GitHub profile 🙏 to help us grow our open-source community and find more contributors like you!**
 
-Find us online:
+Support our mission further by [sponsoring us on GitHub](https://github.com/sponsors/chaynHQ), exploring our [volunteer programs](https://www.chayn.co/get-involved), and following Chayn on social media: - Linktree: [https://linktr.ee/chayn](https://linktr.ee/chayn) - Twitter: [@chaynhq](https://twitter.com/ChaynHQ) - Instagram: [@chaynhq](https://www.instagram.com/chaynhq/) - Youtube: [@chaynhq](https://www.youtube.com/@chaynhq) - Facebook: [@chayn](https://www.facebook.com/chayn) - LinkedIn: [@chayn](https://www.linkedin.com/company/chayn).
 
-- Website: [https://www.chayn.co/](https://www.chayn.co/)
-- Linktree: [https://linktr.ee/chayn](https://linktr.ee/chayn)
-- Twitter: [@ChaynHQ](https://twitter.com/ChaynHQ)
-- Instagram: [@chaynhq](https://www.instagram.com/chaynhq/)
-- Youtube: [Chayn Team](www.youtube.com/@chaynhq)
-- LinkedIn: [@chayn](https://www.linkedin.com/company/chayn)
+# Bloom Backend Contribution Docs:
 
-# Contributing to Bloom Backend
-
-Before making a contribution, please read our Contributing Guidelines in the [CONTRIBUTING.md](/CONTRIBUTING.md) file.
-
-We ask all contributors to follow our [Contributing Guidelines](/CONTRIBUTING.md) to help Chayn developers maintain open-source best practices.
+By making an open-source contribution to Chayn, you have agreed to our [Code of Conduct](/CODE_OF_CONDUCT.md).
 
 Happy coding! ⭐
 
 ## Technologies Used:
 
-For a more detailed explanation of this project's key concepts and architecture, please visit the [/docs directory](https://github.com/chaynHQ/bloom-backend/tree/develop/docs).
+Visit the [/docs directory](https://github.com/chaynHQ/bloom-backend/tree/develop/docs) for an overview of Bloom's backend architecture and key concepts.
 
 - [NestJS](https://nestjs.com/) - NodeJs framework for building scalable and reliable server-side applications
 - [PostgreSQL](https://www.postgresql.org/about/) - Object-relational SQL database system
@@ -46,63 +37,41 @@ For a more detailed explanation of this project's key concepts and architecture,
 - [Docker](https://www.docker.com/) - Containers for api and db
 - [Heroku](https://heroku.com) - Build, deploy and operate staging and production apps
 - [GitHub Actions](https://github.com/features/actions) - CI pipeline
+- [ESLint](https://eslint.org/) and [Prettier](https://prettier.io/) for linting and formatting.
 
 ## Local development
 
+### Summary
+
+To run Bloom's backend: install prerequisites, configure environment variables, install dependencies, then run in a Dev Container, with Docker, or manually.
+
+Most contributions (and running Cypress integration tests from the frontend) require [populating your local database](#populate-database) with test data.
+
 ### Prerequisites
 
 - NodeJS v20.x
 - Yarn v1.x
 - Docker
-
-### Run in Dev Container - OPTIONAL
-
-**Recommended for Visual Studio & Visual Studio Code users.**
-
-This method will automatically install all dependencies and IDE settings in a Dev Container (Docker container) within Visual Studio Code.
-
-Directions for running a dev container:
-
-1. Meet the [system requirements](https://code.visualstudio.com/docs/devcontainers/containers#_system-requirements)
-2. Follow the [installation instructions](https://code.visualstudio.com/docs/devcontainers/containers#_installation)
-3. [Check the installation](https://code.visualstudio.com/docs/devcontainers/tutorial#_check-installation)
-4. After you've verified that the extension is installed and working, click on the "Remote Status" bar icon and select
-   "Reopen in Container". From here, the option to "Re-open in Container" should pop up in notifications whenever opening this project in VS.
-5. [Configure your environment variables](#configure-environment-variables) and develop as you normally would.
-
-The dev Container is configured in the `.devcontainer` directory:
-
-- `docker-compose.yml` file in this directory extends the `docker-compose.yml` in the root directory.
-- `devcontainer.json` configures the integrations with Visual Studio Code, such as the IDE extensions and settings in the `vscode` directory.
-
-See [Visual Studio Code Docs: Developing Inside a Dev Container](https://code.visualstudio.com/docs/devcontainers/containers) for more info.
-
-### Install dependencies
-
-```bash
-yarn
-```
+- PostgreSQL 16
+- Read [Contribution Guidelines](/CONTRIBUTING.md)
 
 ### Configure Environment Variables
 
-Create a new `.env` file and populate it with the variables below. Note that only the Firebase and Simplybook tokens are required.
-To configure the Firebase variables, first [create a Firebase project in the Firebase console](https://firebase.google.com/) (Google account required).
-Next, follow [these directions](https://firebase.google.com/docs/cloud-messaging/auth-server#provide-credentials-manually) to generate a private key file in JSON format.
-These will generate all the required Firebase variables.
-
-The Simplybook variables can be mocked data, meaning **you do not need to use real Simplybook variables, simply copy paste the values given below.**
-If you acquire real Simplybook environment variables, use the same format given below.
+Create a new `.env` file and fill it with the **required** environment variables:
 
 ```
-ROLLBAR_ENV=development
+# Variables for building and running tests.
+# Provided variables are read-only and subject to change.
+#===============================================================
+# REQUIRED VARIABLES FOR LOCAL DEVELOPMENT
+#---------------------------------------------------------------
+# CORE ENVIRONMENT VARIABLES
 PORT=35001
-
 DATABASE_URL=postgres://<username>:<password>@<host>:<port>/<db>
-
 NODE_ENV=development
 
+# FIREBASE AUTH AND ANALYTICS
 FIREBASE_TYPE=service_account
-
 FIREBASE_PROJECT_ID=
 FIREBASE_PRIVATE_KEY_ID=
 FIREBASE_PRIVATE_KEY=
@@ -112,58 +81,50 @@ FIREBASE_AUTH_URI=https://accounts.google.com/o/oauth2/auth
 FIREBASE_TOKEN_URI=https://oauth2.googleapis.com/token
 FIREBASE_CERT_URL=https://www.googleapis.com/oauth2/v1/certs
 FIREBASE_CLIENT_CERT=
-
 FIREBASE_API_KEY=
 FIREBASE_AUTH_DOMAIN=
 FIREBASE_PROJECT_ID=
 FIREBASE_STORAGE_BUCKET=
 FIREBASE_MESSAGING_SENDER_ID=
 FIREBASE_API_ID=
-FIREBASE_MEASUREMENT_ID= # must enable Google Anayltics in Firebase project
+FIREBASE_MEASUREMENT_ID=
 
-# VARIABLES REQUIRED FOR TESTING, REPLACE WITH REAL VALUES IF NEEDED
+# REQUIRED VARIABLES FOR TESTING
+#---------------------------------------------------------------
+# MOCK VALUES (can replace with real values or new mocks in same format)
 SIMPLYBOOK_CREDENTIALS='{"login":"testlogin","password":"testpassword","company":"testcompany"}'
 SIMPLYBOOK_COMPANY_NAME=testcompany
 
-# VARIABLES BELOW ARE ALL OPTIONAL
-ROLLBAR_TOKEN=
-ZAPIER_TOKEN=
-SLACK_WEBHOOK_URL=
-CRISP_TOKEN=
-CRISP_WEBSITE_TOKEN=
-MAILCHIMP_API_KEY=
-MAILCHIMP_AUDIENCE_ID=
-MAILCHIMP_SERVER_PREFIX=
-RESPOND_IO_CREATE_CONTACT_WEBHOOK=
-RESPOND_IO_DELETE_CONTACT_WEBHOOK=
+# OPTIONAL VARIABLES
+#---------------------------------------------------------------
+ROLLBAR_ENV=development # Rollbar logging
+ROLLBAR_TOKEN= # Rollbar logging
+ZAPIER_TOKEN= # Zapier automation
+SLACK_WEBHOOK_URL= # Slack messaging bots
+CRISP_TOKEN= # Crisp chat
+MAILCHIMP_API_KEY= # Email messaging
+RESPOND_IO_CREATE_CONTACT_WEBHOOK= # RESPOND.IO
+RESPOND_IO_DELETE_CONTACT_WEBHOOK= # RESPOND.IO
 ```
 
-### Run the App Locally
-
-#### Using Docker - RECOMMENDED
+#### How to Configure Firebase Variables:
 
-The project is containerized and can be run solely in docker - both the PostgreSQL database and NestJS app. To run the backend locally, make sure your system has Docker installed - you may need Docker Desktop if using a Mac or Windows.
+Bloom's required Firebase variables are obtained by creating a Firebase project, then generating a private key file in JSON format. First, create a Firebase project [in the Firebase console here](https://firebase.google.com/) (Google account required). Next, [follow these directions](https://firebase.google.com/docs/cloud-messaging/auth-server#provide-credentials-manually) to generate your private key file.
 
-First make sure the docker app is running (just open the app). Then run
+### Install dependencies with yarn
 
 ```bash
-docker-compose up
-```
-
-You should see this in the shell output:
-
-```shell
-Listening on localhost:35001, CTRL+C to stop
+yarn
 ```
 
-_Note: you can use an application like Postman to test the apis locally_
+### Run in Docker - Recommended
 
-#### Without Docker
+Bloom's backend is containerized and can be run solely in Docker - both the PostgreSQL database and NestJS app. To run the backend locally, make sure your system has Docker installed - you may need Docker Desktop if using a Mac or Windows.
 
-First install [postgres](https://www.postgresql.org/). Next follow directions to [seed the database](#seed-local-database), then run:
+First, make sure the Docker app is running (just open the app). Then run
 
 ```bash
-yarn start:dev
+docker-compose up
 ```
 
 You should see this in the shell output:
@@ -172,39 +133,43 @@ You should see this in the shell output:
 Listening on localhost:35001, CTRL+C to stop
 ```
 
-### Database migrations
+_Note: you can use an application like Postman to test the apis locally_
 
-A migration in TypeORM is a single file with SQL queries to update a database schema as updates/additions are made. Read more about migrations [here](https://github.com/typeorm/typeorm/blob/master/docs/migrations.md).
+### Run in Dev Container - Recommended for Visual Studio Users
 
-Migrations are automatically run when the app is built docker (locally) or Heroku for staging and production apps.
+This method will automatically install all dependencies, IDE settings, and postgres container in a Dev Container (Docker container) within Visual Studio Code.
 
-**You'll need to generate and run a migration each time you add or update a database field or table.**
+Directions for running a dev container:
 
-To generate a new migration
+1. Meet the [system requirements](https://code.visualstudio.com/docs/devcontainers/containers#_system-requirements)
+2. Follow the [installation instructions](https://code.visualstudio.com/docs/devcontainers/containers#_installation)
+3. [Check the installation](https://code.visualstudio.com/docs/devcontainers/tutorial#_check-installation)
+4. After you've verified that the extension is installed and working, click on the "Remote Status" bar icon and select
+   "Reopen in Container". From here, the option to "Re-open in Container" should pop up in notifications whenever opening this project in VS.
+5. [Configure your environment variables](#configure-environment-variables) and develop as you normally would.
 
-```bash
-yarn migration:generate
-```
+The dev Container is configured in the `.devcontainer` directory:
 
-Add the new migration import into [typeorm.config.ts](./src/typeorm.config.ts)
+- `docker-compose.yml` file in this directory extends the `docker-compose.yml` in the root directory.
+- `devcontainer.json` configures the integrations with Visual Studio Code, such as the IDE extensions and settings in the `vscode` directory.
 
-To run (apply) migrations
+See [Visual Studio Code Docs: Developing Inside a Dev Container](https://code.visualstudio.com/docs/devcontainers/containers) for more info.
 
-```bash
-yarn migration:run
-```
+### Run Manually
 
-To revert a migration
+Manage postgres locally to [populate the database](#populate-database), then run:
 
 ```bash
-yarn migration:revert
+yarn start:dev
 ```
 
-Note that when running the app in Docker, you may need to run migration commands from the docker terminal/Exec
+You should see this in the shell output:
 
-**New environment variables must be added to Heroku before release.**
+```shell
+Listening on localhost:35001, CTRL+C to stop
+```
 
-### Run unit tests
+### Unit Testing
 
 To run all unit tests
 
@@ -218,7 +183,11 @@ To have your unit tests running in the background as you change code:
 yarn test:watch
 ```
 
-### Formatting and linting
+### Format and Linting
+
+Linting and formatting are provided by [ESLint](https://eslint.org/) and [Prettier](https://prettier.io/). We recommend VSCode users to utilize the workspace settings in [.vscode/settings.json](.vscode/settings.json) and install the extensions in [.vscode/extensions](.vscode/extensions.json) for automated consistency.
+
+**We strongly recommend maintaining consistent code style by linting and formatting before every commit:**
 
 To run linting
 
@@ -232,27 +201,61 @@ To lint and fix
 yarn lint:fix
 ```
 
-Formatting and linting is provided by ESLint and Prettier (see the relevant configs for details).
+Run format and fix:
 
-Workspace settings for VSCode are included for consistent linting and formatting.
+```bash
+yarn format
+```
 
-### Seed Local Database
+### Populate Database
 
-If you're an open-source contributor, add data to your local database by seeding it with a backup file. Please read the [Chayn Tech Wiki Guide](https://www.notion.so/chayn/Tech-volunteer-wiki-5356c7118c134863a2e092e9df6cbc34?pvs=4#0fb25ffde84f4854b2d9730200eee283) to obtain a backup file and follow directions to seed the local database.
+Most open-source contributions (like running Cypress integration tests from the frontend) require adding test data to your local database. To do this, navigate to our [Chayn Tech Wiki Guide](https://www.notion.so/chayn/Chayn-Tech-Contributor-Wiki-5356c7118c134863a2e092e9df6cbc34?pvs=4#eb2e24de94bd451f8683abe496656013) to obtain a backup file and follow directions there to populate your local database.
 
-If you're staff and have access to Heroku, you also have the option to seed the database via the following script. Before you start, make sure:
+Chayn staff with access to Heroku, you also have the option to seed the database via the following script. Before you start, make sure:
 
 1. bloom-local-db container is running in Docker
 2. you are logged into the Heroku via your terminal. Read more about the Heroku Cli [here](https://devcenter.heroku.com/articles/heroku-cli)
 3. Replace <HEROKU_APP_NAME> with the correct Heroku app name in the `seed-local-db.sh file`
 4. Run `chmod +x ./seed-local-db.sh` in your terminal to make the file executable
 
-After the above has been confirmed, run
+   After the above has been confirmed, run
+
+   ```bash
+   bash seed-local-db.sh
+   ```
+
+### Database Migrations
+
+A migration in TypeORM is a single file with SQL queries to update a database schema as updates/additions are made. Read more about migrations [here](https://github.com/typeorm/typeorm/blob/master/docs/migrations.md).
+
+Migrations are automatically run when the app is built docker (locally) or Heroku for staging and production apps.
+
+**You'll need to generate and run a migration each time you add or update a database field or table.**
+
+To generate a new migration
+
+```bash
+yarn migration:generate
+```
+
+Add the new migration import into [typeorm.config.ts](./src/typeorm.config.ts)
+
+To run (apply) migrations
+
+```bash
+yarn migration:run
+```
+
+To revert a migration
 
 ```bash
-bash seed-local-db.sh
+yarn migration:revert
 ```
 
+Note that when running the app in Docker, you may need to run migration commands from the docker terminal/Exec
+
+**New environment variables must be added to Heroku before release.**
+
 ## Git Flow and Deployment
 
 **The develop branch is our source of truth, not main.**
diff --git a/docker-compose.yml b/docker-compose.yml
index 519be79c..23f15ae9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - .:/app
 
   db:
-    image: postgres:14-alpine
+    image: postgres:16
     container_name: bloom-local-db
     restart: unless-stopped
     ports: