diff --git a/addons/ambassador/preview.yaml b/addons/ambassador/ambassador.yaml
similarity index 70%
rename from addons/ambassador/preview.yaml
rename to addons/ambassador/ambassador.yaml
index 2b4b92f1..314e3d83 100644
--- a/addons/ambassador/preview.yaml
+++ b/addons/ambassador/ambassador.yaml
@@ -1,6 +1,3 @@
-# ------------------------------------------------------------------------------
-# PREVIEW: this addon is in preview mode and only intended for use in testing environments.
-# ------------------------------------------------------------------------------
 apiVersion: kubeaddons.mesosphere.io/v1beta2
 kind: ClusterAddon
 metadata:
@@ -27,10 +24,6 @@ spec:
       enabled: false
     - name: vsphere
       enabled: false
-# TODO: at the time of writing there are several changes in flight for our cert-manager addon and we're holding on cert-manager integration until a follow-up iteration
-#  requires:
-#    - matchLabels:
-#        kubeaddons.mesosphere.io/name: cert-manager
   chartReference:
     chart: ambassador
     repo: https://getambassador.io
diff --git a/test/groups.yaml b/test/groups.yaml
index e3fa681f..8143a979 100644
--- a/test/groups.yaml
+++ b/test/groups.yaml
@@ -20,8 +20,6 @@ general:
 
 # ------------------------------------------------------------------------------
 # All Ambassador related addons should be tested as a part of this group
-#
-# NOTE: Ambassador is currently in PREVIEW
 # ------------------------------------------------------------------------------
 ambassador:
     - "ambassador"