diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 27850d1b..ee30fb33 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -13,14 +13,49 @@ Please read this before contributing.
 We're trying to keep it simple and promote the best tools, not all of them.
 
 ## Software Criteria
-
+### Main
 - Easy to use. Could your mother use that tool or service? Usability is most important.
 - Cross-platform / Accessible.
 - Privacy respecting.
 - Open Source / free software is preferred but not required.
+- Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable)
+- Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability.
 
 There can be exceptions if no software is available that meet the criteria.
 
+Note: This criteria applies to all of privacytools.io
+### Proividers
+- Prioritize Products by privacy respecting nationality.
+
+### VPN
+- Prioritize Products by privacy respecting nationality.
+- Cannot be based in USA or UK.
+- Must be acessable via free software (i.e OpenVPN, WireGuard)
+- Use Encryption
+- Accept Cryptocurrency
+- No logging policy
+
+### Email
+- Outside of USA
+- Support SMTP SSL
+- Accessable Using Free Software (i.e IMAP)
+
+### Hardware
+- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable)
+- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible.
+- Cannot lock users to a particular platform.
+
+### Software
+- Must be able to download over encrypted network (can be a mirror)
+- Must be free software
+
+### Encryption
+- Only verifiable encryption is to be trusted
+
+### OSes
+- Must state if recommends, depends on, or offers non-free software (contrib)
+- No Tracking Policy (opt-in analytics is ok)
+
 ## Images
 
 - Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png))