diff --git a/README.md b/README.md
index 80b1798c..8d00b0bc 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ You can use it to:
 
 Whatever your use case, `step-ca` is easy to use and hard to misuse, thanks to [safe, sane defaults](./docs/defaults.md).
 
-**Questions? Find us [on gitter](https://gitter.im/smallstep/community).**
+**Questions? Find us in [Discussions](https://github.com/smallstep/certificates/discussions).**
 
 [Website](https://smallstep.com/certificates) |
 [Documentation](#documentation) |
@@ -383,6 +383,5 @@ and visiting http://localhost:8080.
 
 ## Feedback?
 
-* Tell us what you like and don't like about managing your PKI - we're eager to
-help solve problems in this space.
-* Tell us about a feature you'd like to see - open an issue, [ask on gitter](https://gitter.im/smallstep/community), or hit us up on [Twitter](https://twitter.com/smallsteplabs).
+* Tell us what you like and don't like about managing your PKI - we're eager to help solve problems in this space.
+* Tell us about a feature you'd like to see! [Add a feature request Issue](https://github.com/smallstep/certificates/issues/new?assignees=&labels=enhancement%2C+needs+triage&template=enhancement.md&title=), [ask on Discussions](https://github.com/smallstep/certificates/discussions), or hit us up on [Twitter](https://twitter.com/smallsteplabs).
diff --git a/cmd/step-ca/main.go b/cmd/step-ca/main.go
index 2151d80f..d7726321 100644
--- a/cmd/step-ca/main.go
+++ b/cmd/step-ca/main.go
@@ -77,7 +77,7 @@ This documentation is available online at https://smallstep.com/docs/certificate
 	`
 The **step-ca** utility is not instrumented for usage statistics. It does not phone home.
 But your feedback is extremely valuable. Any information you can provide regarding how you’re using **step-ca** helps.
-Please send us a sentence or two, good or bad: **feedback@smallstep.com** or join https://gitter.im/smallstep/community.
+Please send us a sentence or two, good or bad: **feedback@smallstep.com** or https://github.com/smallstep/certificates/discussions.
 {{end}}
 `
 
diff --git a/docs/README.md b/docs/README.md
index b7112d5e..3d8f01b4 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,7 +3,6 @@
 Index of Documentation and Tutorials for using and deploying the `step certificates`.
 
 [![GitHub release](https://img.shields.io/github/release/smallstep/certificates.svg)](https://github.com/smallstep/certificates/releases)
-[![Join the chat at https://gitter.im/smallstep/community](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/smallstep/community)
 [![CA Image](https://images.microbadger.com/badges/image/smallstep/step-ca.svg)](https://microbadger.com/images/smallstep/step-ca)
 [![Go Report Card](https://goreportcard.com/badge/github.com/smallstep/certificates)](https://goreportcard.com/report/github.com/smallstep/certificates)
 [![Build Status](https://travis-ci.com/smallstep/certificates.svg?branch=master)](https://travis-ci.com/smallstep/certificates)
diff --git a/docs/acme.md b/docs/acme.md
index 5aec7206..eeb8c59c 100644
--- a/docs/acme.md
+++ b/docs/acme.md
@@ -155,6 +155,7 @@ to the top of your renewal configuration (e.g., in `/etc/letsencrypt/renewal/foo
 
 `step-ca` should work with any ACMEv2
 ([RFC8555](https://tools.ietf.org/html/rfc8555)) compliant client that supports
-the http-01 or dns-01 challenge. If you run into any issues please let us know
-[on gitter](https://gitter.im/smallstep/community) or [in an
-issue](https://github.com/smallstep/certificates/issues/new?template=bug_report.md).
+the http-01 or dns-01 challenge.
+
+Post feedback on [our GitHub Discussions tab](https://github.com/smallstep/certificates/discussions),
+or [create a bug report issue](https://github.com/smallstep/certificates/issues/new?template=bug_report.md).
diff --git a/docs/defaults.md b/docs/defaults.md
index 6c775413..05e8acdc 100644
--- a/docs/defaults.md
+++ b/docs/defaults.md
@@ -12,8 +12,7 @@ intend for this document be an accurate representation of current best practices
 in the industry, and to have these practices codified as defaults in the `step
 certificates` code base. If you have questions, suggestions, or comments about
 any of these decisions please let us know by opening an issue on this repo,
-reaching out through [Twitter](twitter.com/smallsteplabs), or through our
-[Gitter](https://gitter.im/smallstep/community) to chat with us in real time.
+reaching out through [GitHub Discussions](https://github.com/smallstep/certificates/discussions).
 
 ## Tokens
 
diff --git a/docs/revocation.md b/docs/revocation.md
index c8384d46..e994940d 100644
--- a/docs/revocation.md
+++ b/docs/revocation.md
@@ -202,7 +202,7 @@ through an example.
 [Use TLS Everywhere](https://smallstep.com/blog/use-tls.html) and let us know
 what you think of our tools. Get in touch over
 [Twitter](twitter.com/smallsteplabs) or through our
-[Gitter](https://gitter.im/smallstep/community) to chat with us in real time.
+[GitHub Discussions](https://github.com/smallstep/certificates/discussions) to chat with us in real time.
 
 ## Further Reading
 
diff --git a/pki/pki.go b/pki/pki.go
index f58cfb38..0576bc00 100644
--- a/pki/pki.go
+++ b/pki/pki.go
@@ -401,7 +401,7 @@ func (p *PKI) askFeedback() {
 	ui.Println("      phone home. But your feedback is extremely valuable. Any information you")
 	ui.Println("      can provide regarding how you’re using `step` helps. Please send us a")
 	ui.Println("      sentence or two, good or bad: \033[1mfeedback@smallstep.com\033[0m or join")
-	ui.Println("      \033[1mhttps://gitter.im/smallstep/community\033[0m.")
+	ui.Println("      \033[1mhttps://github.com/smallstep/certificates/discussions\033[0m.")
 }
 
 // TellPKI outputs the locations of public and private keys generated