diff --git a/SUPPORT.md b/SUPPORT.md
index dc72f0e..edbfcbd 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -1,25 +1,14 @@
-# TODO: The maintainer of this repo has not yet edited this file
-
-**REPO OWNER**: Do you want Customer Service & Support (CSS) support for this product/project?
-
-- **No CSS support:** Fill out this template with information about how to file issues and get help.
-- **Yes CSS support:** Fill out an intake form at [aka.ms/spot](https://aka.ms/spot). CSS will work with/help you to determine next steps. More details also available at [aka.ms/onboardsupport](https://aka.ms/onboardsupport).
-- **Not sure?** Fill out a SPOT intake as though the answer were "Yes". CSS will help you decide.
-
-*Then remove this first heading from this SUPPORT.MD file before publishing your repo.*
-
 # Support
 
 ## How to file issues and get help  
 
-This project uses GitHub Issues to track bugs and feature requests. Please search the existing 
-issues before filing new issues to avoid duplicates.  For new issues, file your bug or 
+This project uses GitHub Issues to track bugs and feature requests. Please search the existing
+issues before filing new issues to avoid duplicates.  For new issues, file your bug or
 feature request as a new Issue.
 
-For help and questions about using this project, please **REPO MAINTAINER: INSERT INSTRUCTIONS HERE 
-FOR HOW TO ENGAGE REPO OWNERS OR COMMUNITY FOR HELP. COULD BE A STACK OVERFLOW TAG OR OTHER
-CHANNEL. WHERE WILL YOU HELP PEOPLE?**.
+For help and questions about using this project, please create a new Discussion in the Discussions
+tab on Github.
 
 ## Microsoft Support Policy  
 
-Support for this **PROJECT or PRODUCT** is limited to the resources listed above.
+Support for this project is limited to the resources listed above.
diff --git a/setup.py b/setup.py
index 1801098..16d6711 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,11 @@
 setup(
     name='quilla',
     version=version,
-    description="Declarative UI testing with JSON",
+    description='Declarative UI testing with JSON',
+    author='Natalia Maximo',
+    author_email='tal.afp.max@gmail.com',
+    maintainer='CRE Avengers',
+    maintainer_email='cre-avengers@microsoft.com',
     long_description=long_description,
     long_description_content_type='text/markdown',
     url='https://github.com/microsoft/quilla',