diff --git a/package.json b/package.json
index 269328d5221..471a7cba762 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
     "html-webpack-plugin": "^3.2.0",
     "husky": "^1.3.1",
     "inquirer": "^6.2.2",
-    "issue-regex": "^3.0.0",
     "jest": "^23.6.0",
     "jest-date-mock": "^1.0.6",
     "lint-staged": "^8.1.3",
diff --git a/scripts/cli/tasks/changelog.ts b/scripts/cli/tasks/changelog.ts
index 3e87ca888b0..1e8ebf9c09c 100644
--- a/scripts/cli/tasks/changelog.ts
+++ b/scripts/cli/tasks/changelog.ts
@@ -1,6 +1,5 @@
 import { Task, TaskRunner } from './task';
 import axios from 'axios';
-import issueRegex from 'issue-regex';
 
 const githubGrafanaUrl = 'https://github.com/grafana/grafana';
 
@@ -16,12 +15,9 @@ const changelogTaskRunner: TaskRunner<ChangelogOptions> = async () => {
   let markdown = '';
 
   for (const item of res.data) {
-    markdown += '* ' + item.title;
-    markdown += ` [#${item.number}](${githubGrafanaUrl}/issues/${item.number})`;
-
-    for (const issue of item.body.match(issueRegex())) {
-      markdown += ` [#${issue}](${githubGrafanaUrl}/issues/${issue})`;
-    }
+    markdown += '* ' + item.title + '.';
+    markdown += ` [#${item.number}](${githubGrafanaUrl}/pull/${item.number})`;
+    markdown += `, [@${item.user.login}](${item.user.html_url})`;
 
     markdown += '\n';
   }
diff --git a/yarn.lock b/yarn.lock
index 4bfd7775564..3d97ef64374 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9929,11 +9929,6 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-issue-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/issue-regex/-/issue-regex-3.0.0.tgz#275c5dac460e7827819f749747baf686109695b7"
-  integrity sha512-KGkx4olfVCmESgFvImfiehUcY+WXnyVZ7uHKJO1eJWQr5QaAn9MSc0ejbCqCrBjafxwDxJ3cB5+dw8tQ8KZNzg==
-
 istanbul-api@^1.3.1:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"