diff --git a/README.md b/README.md
index 9c3086c7e9..80e0389f0c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 The Open Policy Agent (OPA) is an open source, general-purpose policy engine that enables unified, context-aware policy enforcement across the entire stack.
 
-OPA is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CNCF) as an incubating-level project. If you are an organization that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF. For details read the CNCF [announcement](https://www.cncf.io/blog/2019/04/02/toc-votes-to-move-opa-into-cncf-incubator/).
+OPA is hosted by the [Cloud Native Computing Foundation](https://cncf.io) (CNCF) as a graduated project. If you are an organization that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF. For details read the CNCF [announcement](https://www.cncf.io/announcements/2021/02/04/cloud-native-computing-foundation-announces-open-policy-agent-graduation/).
 
 ## Want to learn more about OPA?
 
diff --git a/docs/website/layouts/index.html b/docs/website/layouts/index.html
index ddae1a9084..8c667d71f8 100644
--- a/docs/website/layouts/index.html
+++ b/docs/website/layouts/index.html
@@ -350,8 +350,8 @@ deny[msg] {
                                 <div class="text-center blue">
                                   <button
                                       class="mt-4 btn btn-primary btn-playground"><a
-                                      target="_blank" 
-                                      href="https://play.openpolicyagent.org/p/ikesWCFIH8">Open In Playground 
+                                      target="_blank"
+                                      href="https://play.openpolicyagent.org/p/ikesWCFIH8">Open In Playground
                                       <img src="/live-blocks/icons/playground-open.svg"
                                         class="launch-playground-icon"></a>
                                   </button>
@@ -436,8 +436,8 @@ deny[msg] {
                                 <div class="text-center blue">
                                   <button
                                       class="mt-4 btn btn-primary btn-playground"><a
-                                      target=”_blank” 
-                                      href="https://play.openpolicyagent.org/p/oL4Ofd1nQi">Open In Playground 
+                                      target=”_blank”
+                                      href="https://play.openpolicyagent.org/p/oL4Ofd1nQi">Open In Playground
                                       <img src="/live-blocks/icons/playground-open.svg"
                                         class="launch-playground-icon"></a>
                                   </button>
@@ -560,8 +560,8 @@ allow {
                               <div class="text-center blue">
                                 <button
                                     class="mt-4 btn btn-primary btn-playground"><a
-                                    target=”_blank” 
-                                    href="https://play.openpolicyagent.org/p/DqXNKeLm20">Open In Playground 
+                                    target=”_blank”
+                                    href="https://play.openpolicyagent.org/p/DqXNKeLm20">Open In Playground
                                     <img src="/live-blocks/icons/playground-open.svg"
                                       class="launch-playground-icon"></a>
                                 </button>
@@ -661,8 +661,8 @@ source_spiffe_id = client_id {
                               <div class="text-center blue">
                                 <button
                                     class="mt-4 btn btn-primary btn-playground"><a
-                                    target=”_blank” 
-                                    href="https://play.openpolicyagent.org/p/FiFAMwNoqm">Open In Playground 
+                                    target=”_blank”
+                                    href="https://play.openpolicyagent.org/p/FiFAMwNoqm">Open In Playground
                                     <img src="/live-blocks/icons/playground-open.svg"
                                       class="launch-playground-icon"></a>
                                 </button>
@@ -747,8 +747,8 @@ allow {
                               <div class="text-center blue">
                                 <button
                                     class="mt-4 btn btn-primary btn-playground"><a
-                                    target=”_blank” 
-                                    href="https://play.openpolicyagent.org/p/qUkvgJRpIU">Open In Playground 
+                                    target=”_blank”
+                                    href="https://play.openpolicyagent.org/p/qUkvgJRpIU">Open In Playground
                                     <img src="/live-blocks/icons/playground-open.svg"
                                       class="launch-playground-icon"></a>
                                 </button>
@@ -815,8 +815,8 @@ allowed_pets[pet] {
                               <div class="text-center blue">
                                 <button
                                     class="mt-4 btn btn-primary btn-playground"><a
-                                    target=”_blank” 
-                                    href="https://play.openpolicyagent.org/p/c6412EHjS7">Open In Playground 
+                                    target=”_blank”
+                                    href="https://play.openpolicyagent.org/p/c6412EHjS7">Open In Playground
                                     <img src="/live-blocks/icons/playground-open.svg"
                                       class="launch-playground-icon"></a>
                                 </button>
@@ -987,8 +987,8 @@ deny[msg] {
                         <div class="text-center blue">
                           <button
                               class="mt-4 btn btn-primary btn-playground"><a
-                              target=”_blank” 
-                              href="https://play.openpolicyagent.org/p/ikesWCFIH8">Open In Playground 
+                              target=”_blank”
+                              href="https://play.openpolicyagent.org/p/ikesWCFIH8">Open In Playground
                               <img src="/live-blocks/icons/playground-open.svg"
                                 class="launch-playground-icon"></a>
                           </button>
@@ -1073,8 +1073,8 @@ deny[msg] {
                         <div class="text-center blue">
                           <button
                               class="mt-4 btn btn-primary btn-playground"><a
-                              target=”_blank” 
-                              href="https://play.openpolicyagent.org/p/oL4Ofd1nQi">Open In Playground 
+                              target=”_blank”
+                              href="https://play.openpolicyagent.org/p/oL4Ofd1nQi">Open In Playground
                               <img src="/live-blocks/icons/playground-open.svg"
                                 class="launch-playground-icon"></a>
                           </button>
@@ -1203,8 +1203,8 @@ allow {
                         <div class="text-center blue">
                           <button
                               class="mt-4 btn btn-primary btn-playground"><a
-                              target=”_blank” 
-                              href="https://play.openpolicyagent.org/p/DqXNKeLm20">Open In Playground 
+                              target=”_blank”
+                              href="https://play.openpolicyagent.org/p/DqXNKeLm20">Open In Playground
                               <img src="/live-blocks/icons/playground-open.svg"
                                 class="launch-playground-icon"></a>
                           </button>
@@ -1304,8 +1304,8 @@ source_spiffe_id = client_id {
                         <div class="text-center blue">
                           <button
                               class="mt-4 btn btn-primary btn-playground"><a
-                              target=”_blank” 
-                              href="https://play.openpolicyagent.org/p/FiFAMwNoqm">Open In Playground 
+                              target=”_blank”
+                              href="https://play.openpolicyagent.org/p/FiFAMwNoqm">Open In Playground
                               <img src="/live-blocks/icons/playground-open.svg"
                                 class="launch-playground-icon"></a>
                           </button>
@@ -1395,8 +1395,8 @@ allow {
                         <div class="text-center blue">
                           <button
                               class="mt-4 btn btn-primary btn-playground"><a
-                              target=”_blank” 
-                              href="https://play.openpolicyagent.org/p/qUkvgJRpIU">Open In Playground 
+                              target=”_blank”
+                              href="https://play.openpolicyagent.org/p/qUkvgJRpIU">Open In Playground
                               <img src="/live-blocks/icons/playground-open.svg"
                                 class="launch-playground-icon"></a>
                           </button>
@@ -1463,8 +1463,8 @@ allowed_pets[pet] {
                         <div class="text-center blue">
                           <button
                               class="mt-4 btn btn-primary btn-playground"><a
-                              target=”_blank” 
-                              href="https://play.openpolicyagent.org/p/c6412EHjS7">Open In Playground 
+                              target=”_blank”
+                              href="https://play.openpolicyagent.org/p/c6412EHjS7">Open In Playground
                               <img src="/live-blocks/icons/playground-open.svg"
                                 class="launch-playground-icon"></a>
                           </button>
@@ -1497,7 +1497,7 @@ allowed_pets[pet] {
             performant, fine-grained controls. Use a language
             purpose-built for policy in a world where JSON is
             pervasive. Iterate, traverse hierarchies, and apply
-            50+ built-ins like string manipulation and JWT
+            150+ built-ins like string manipulation and JWT
             decoding to declare the policies you want enforced.</p>
         </div>
         <div class="col-12 col-sm-12 col-md-6 mt-3 mt-sm-0">
@@ -1684,7 +1684,7 @@ allowed_pets[pet] {
           <div class="mt-4" style="font-weight:600"><label>Learn More</label></div>
           <div class="mt-2">
             <a href="https://marketplace.visualstudio.com/items?itemName=tsandall.opa" class="btn btn-primary more-link" target="_blank">VScode</a>
-              <a href="https://play.openpolicyagent.org/" class="btn btn-primary more-link" target="_blank">Rego Playground</a> 
+              <a href="https://play.openpolicyagent.org/" class="btn btn-primary more-link" target="_blank">Rego Playground</a>
               <a href="./docs/latest/#running-opa" class="btn btn-primary more-link" target="_blank">General Tooling</a>
           </div>
         </div>
@@ -1697,7 +1697,7 @@ allowed_pets[pet] {
       <div class="row">
         <div class="col-12">
           <div class="footer-text">
-            Open Policy Agent is a Cloud Native Computing Foundation incubating
+            Open Policy Agent is a Cloud Native Computing Foundation graduated
             project.
           </div>
           <div class="footer-logo pb-4">