diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index c4348407a..fc66624fb 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -328,21 +328,6 @@ Some items are not supported by the `nsm.el' module."
 ;;
 ;;; Reporting bugs
 
-;;;###autoload
-(defun doom/issue-tracker ()
-  "Open Doom Emacs' issue tracker on Discourse."
-  (interactive)
-  (browse-url "https://discourse.doomemacs.org/c/support"))
-
-;;;###autoload
-(defun doom/report-bug ()
-  "Open the browser on our Discourse.
-
-If called when a backtrace buffer is present, it and the output of `doom-info'
-will be automatically appended to the result."
-  (interactive)
-  (browse-url "https://discourse.doomemacs.org/how2report"))
-
 ;;;###autoload
 (defun doom/copy-buffer-contents (buffer-name)
   "Copy the contents of BUFFER-NAME to your clipboard."
diff --git a/core/autoload/help.el b/core/autoload/help.el
index 05d52dd14..9d8672378 100644
--- a/core/autoload/help.el
+++ b/core/autoload/help.el
@@ -173,6 +173,28 @@ selection of all minor-modes, active or not."
   (interactive)
   (browse-url "https://doomemacs.org"))
 
+;;;###autoload
+(defun doom/issue-tracker ()
+  "Open Doom Emacs' issue tracker on Discourse."
+  (interactive)
+  (browse-url "https://github.com/hlissner/doom-emacs/issues"))
+
+;;;###autoload
+(defun doom/report-bug ()
+  "Open the browser on our Discourse.
+
+If called when a backtrace buffer is present, it and the output of `doom-info'
+will be automatically appended to the result."
+  (interactive)
+  ;; TODO Upload doom/info to pastebin and append to querystring
+  (browse-url "https://github.com/hlissner/doom-emacs/issues/new?labels=1.+bug%2C2.+status%3Aunread&template=bug_report.yml"))
+
+;;;###autoload
+(defun doom/discourse ()
+  "Open Doom Emacs' issue tracker on Discourse."
+  (interactive)
+  (browse-url "https://discourse.doomemacs.org"))
+
 ;;;###autoload
 (defun doom/help ()
   "Open Doom's user manual."