diff --git a/.env.example b/.env.example
index 0ca7bd46..5f7483de 100644
--- a/.env.example
+++ b/.env.example
@@ -27,19 +27,14 @@ EMAIL_TOKEN_LIFETIME=
 # Required
 MONGO_URL=mongodb://root:example@mongo:27017/?authSource=admin
 
-# Optional credentials for MongoDB container instance
-MONGO_INITDB_ROOT_USERNAME=root
-MONGO_INITDB_ROOT_PASSWORD=example
-
-# Mongo-Express vars (needed for development only)
-ME_CONFIG_MONGODB_ADMINUSERNAME=root
-ME_CONFIG_MONGODB_ADMINPASSWORD=example
-ME_CONFIG_MONGODB_URL=mongodb://root:example@mongo:27017/
+# Optional credentials for MongoDB container instance and Mongo-Express
+MONGO_USERNAME=root
+MONGO_PASSWORD=example
 
 # Website URL
 # Required
-NODE_ENV=development
-NEXT_PUBLIC_WEBSITE_URL=http://localhost:8080
+ENV=development
+SITE_URL=http://localhost:8080
 
 # Mail/SMTP
 # Required to send emails
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 05c4d692..e735b10d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,6 +2,6 @@
 
 Thanks for taking the time to contribute! 😃 🚀
 
-Please refer to our [Contributing Guide](https://infisical.com/docs/contributing) for instructions on how to contribute.
+Please refer to our [Contributing Guide](https://infisical.com/docs/contributing/overview) for instructions on how to contribute.
 
 We also have some 🔥amazing🔥 merch for our contributors. Please reach out to tony@infisical.com for more info 👀
diff --git a/README.md b/README.md
index 5b36a143..56ebbea7 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ To quickly get started, visit our [get started guide](https://infisical.com/docs
 
 Infisical is simple, E2EE, and (soon to be) complete.
 
-According to one [report](https://www.ekransystem.com/en/blog/secrets-management) in 2021, only 10% of organizations use secret management solutions despite all using digital secrets to some extent.
+According to a [report](https://www.ekransystem.com/en/blog/secrets-management) in 2019, only 10% of organizations use secret management solutions despite all using digital secrets to some extent.
 
 We're on a mission to make secret management more accessible to everyone — that means building for developers, not just security teams.
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 944d7a56..494a75c0 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -30,6 +30,8 @@ services:
       - /app/node_modules
     command: npm run dev
     env_file: .env
+    environment:
+      - NODE_ENV=${ENV}
     networks:
       - infisical-dev
   
@@ -50,6 +52,7 @@ services:
     env_file: .env
     environment:
       - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
+      - NEXT_PUBLIC_ENV=${ENV}
     networks:
       - infisical-dev
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 939c050f..746362df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,8 @@ services:
     image: infisical/backend
     command: npm run start
     env_file: .env
+    environment:
+      - NODE_ENV=${ENV}
     networks:
       - infisical
   
@@ -42,6 +44,9 @@ services:
       dockerfile: Dockerfile.prod
     image: infisical/frontend
     env_file: .env
+    environment:
+      - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
+      - NEXT_PUBLIC_ENV=${ENV}
     networks:
       - infisical
 
diff --git a/docs/getting-started/features.mdx b/docs/getting-started/features.mdx
index 9c77c225..9ba45b25 100644
--- a/docs/getting-started/features.mdx
+++ b/docs/getting-started/features.mdx
@@ -46,20 +46,20 @@ Missing an integration? Throw in a request.
 
 We're building the future of secret management, one that's comprehensive and accessible to all. Some high-level features we have in mind:
 
-| Feature                               | Status           |
-| ------------------------------------- | ---------------- |
-| Integrations                          | Ongoing          |
-| More hosting options                  | Ongoing          |
-| 1-Click Deploys                       | Ongoing          |
-| Account recovery: Backup key          | Ongoing          |
-| Account recovery: Member-assisted     | Noet yet started |
-| Slack & MS teams integrations         | Not yet started  |
-| Access logs                           | Not yet started  |
-| Version control for secrets           | Not yet started  |
-| 2FA                                   | Not yet started  |
-| Restricted IPs                        | Not yet started  |
-| Read/write access controls            | Not yet started  |
-| Secret rotation                       | Not yet started  |
-| Comparing secrets across environments | Not yet started  |
+| Feature                               | Status          |
+| ------------------------------------- | --------------- |
+| Integrations                          | Ongoing         |
+| More hosting options                  | Ongoing         |
+| 1-Click Deploys                       | Ongoing         |
+| Account recovery: Backup key          | Ongoing         |
+| Account recovery: Member-assisted     | Not yet started |
+| Slack & MS teams integrations         | Not yet started |
+| Access logs                           | Not yet started |
+| Version control for secrets           | Not yet started |
+| 2FA                                   | Not yet started |
+| Restricted IPs                        | Not yet started |
+| Read/write access controls            | Not yet started |
+| Secret rotation                       | Not yet started |
+| Comparing secrets across environments | Not yet started |
 
 Interested in contributing? Check out the guide.