diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
index cc86d9773fa..51f2c2b298c 100644
--- a/.github/RELEASE_TEMPLATE.md
+++ b/.github/RELEASE_TEMPLATE.md
@@ -2,32 +2,20 @@
 
 Compatible with [`jormungandr@{{JORM_TAG}}`](https://github.com/input-output-hk/jormungandr/releases/tag/{{JORM_TAG}}) and [`cardano-node@{{CARDANO_NODE_TAG}}`](https://github.com/input-output-hk/cardano-node/releases/tag/{{CARDANO_NODE_TAG}}).
 
+<!-- A CHANGELOG, organized in three sections:
+ 
+ - New Features
+ - Improvements
+ - Resolved Issues
 
-## New Features
+-->
 
-## Improvements
-
-## Resolved Issues
-
-<!-- Fixes included in this release that were present in the previous release -->
+{{CHANGELOG}}
 
 ## Known Issues
 
 <!-- Bugs known at the moment of the release, or discovered after and not fixed -->
 
-## Changelog
-
-
-<!-- A CHANGELOG, organized in milestones. Ideally, we put it within
-some <details></details> elements to avoid cluttering the release notes -->
-
-{{CHANGELOG}}
-
-
-## Weekly Reports
-
-- [Week 12 - 2020-03-20](https://github.com/input-output-hk/cardano-wallet/tree/weekly-reports/2020-03-20)
-
 ## Documentation
 
 <!-- A snapshot of the documentation at the time of releasing. -->
@@ -57,7 +45,7 @@ the moment of releasing. -->
 
 #### Docker
 
-Pull from DockerHub and verify version.
+Pull from DockerHub and verify the version matches {{CABAL_VERSION}}
 
 ```
 $ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}-jormungandr
@@ -76,7 +64,7 @@ $ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}}-jormungandr versi
 
 #### Docker
 
-Pull from DockerHub and verify version.
+Pull from DockerHub and verify the version matches {{CABAL_VERSION}}.
 
 ```
 $ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}-byron
diff --git a/scripts/make_changelog b/scripts/make_changelog
index 2ce478c220c..193049434fa 100755
--- a/scripts/make_changelog
+++ b/scripts/make_changelog
@@ -18,26 +18,36 @@ REPO="input-output-hk/cardano-wallet"
 : ${GITHUB_API_TOKEN?"Please provide a Github Api Token for fetching pull requests"}
 
 PULL_REQUESTS=$(curl -X GET \
-  -H "Authorization: token $GITHUB_API_TOKEN" \
+  -H "Authorization: token $API_TOKEN" \
   -H "Accept: application/vnd.github.v3+json" \
   https://api.github.com/search/issues?per_page=500\&q=repo:$REPO+is:pr+is:merged+merged:%3E$1)
 
-PULL_REQUESTS=$(echo $PULL_REQUESTS | jq '.items | map({number:.number,title:.title,milestone:.milestone.title}) | group_by(.milestone)')
+PULL_REQUESTS=$(echo $PULL_REQUESTS | jq '.items | map({number:.number,title:.title,label:.labels[0].name}) | group_by(.label)')
 ITEMS=$(echo $PULL_REQUESTS | jq 'map(map("#\(.number) | \(.title)"))')
-MILESTONES=$(echo $PULL_REQUESTS | jq 'map(map("\(.milestone)") | unique) | flatten')
-I=($(echo $MILESTONES | jq 'length - 1'))
+LABELS=$(echo $PULL_REQUESTS | jq 'map(map("\(.label)") | unique) | flatten')
+I=($(echo $LABELS | jq 'length - 1'))
 
 for i in $(seq 0 $I); do
-  MILESTONE=$(echo $MILESTONES | jq -r ".[$i]")
-  echo "<details>"
-  echo "    <summary>$MILESTONE</summary>"
+  LABEL=$(echo $LABELS | jq -r ".[$i]")
+  case $LABEL in
+  "null")
+      echo "## Unclassified"
+      ;;
+  "ADDING FEATURE")
+      echo "## New Features"
+      ;;
+  "IMPROVING CODE")
+      echo "## Improvements"
+      ;;
+  "RESOLVING ISSUE")
+      echo "## Resolved Issues"
+      ;;
+  esac
   echo ""
-  echo "PR | Description"
-  echo "-- | --"
   J=($(echo $ITEMS | jq ".[$i] | length - 1"))
   for j in $(seq 0 $J); do
     LINE=$(echo $ITEMS | jq -r ".[$i] | .[$j]")
-    echo "$LINE"
+    echo "- $LINE"
   done
-  echo "</details>"
+  echo ""
 done