diff --git a/modules/ROOT/pages/_partials/pn-issues-list.adoc b/modules/ROOT/pages/_partials/pn-issues-list.adoc
index 92f840c1..b317232c 100644
--- a/modules/ROOT/pages/_partials/pn-issues-list.adoc
+++ b/modules/ROOT/pages/_partials/pn-issues-list.adoc
@@ -84,13 +84,14 @@
 == Deprecated
 
 // tag::Deprecated-3-0-0-beta[]
-
+No issues at this release
 // end::Deprecated-3-0-0-beta[]
 
 
 == Removed
 
 // tag::Removed-3-0-0-beta[]
+No issues at this release
 
 // end::Removed-3-0-0-beta[]
 
diff --git a/modules/ROOT/pages/release-notes.adoc b/modules/ROOT/pages/release-notes.adoc
index e322424a..a360a76d 100644
--- a/modules/ROOT/pages/release-notes.adoc
+++ b/modules/ROOT/pages/release-notes.adoc
@@ -100,45 +100,8 @@ xref:whatsnew.adoc#use-environment-variables-in-configuration-file[Read More ...
 // tag::enhancements-300[]
 
 // tag::Enhancements-3-0-0-beta[]
+include::partial$pn-issues-list.adoc[tags="Enhancements-3-0-0-beta"]
 
-* https://issues.couchbase.com//browse/CBG-1705[CBG-1705] -- https://issues.couchbase.com//browse/CBG-1705[Release 'view op' on results close]
-* https://issues.couchbase.com//browse/CBG-1679[CBG-1679] -- https://issues.couchbase.com//browse/CBG-1679[Apply standardised timeout and retry for all bootstrap connection ops]
-* https://issues.couchbase.com//browse/CBG-1672[CBG-1672] -- https://issues.couchbase.com//browse/CBG-1672[Return 422 status for unprocessible deltas instead of 404 to use non-delta retry handling]
-* https://issues.couchbase.com//browse/CBG-1664[CBG-1664] -- https://issues.couchbase.com//browse/CBG-1664[Validate javascript syntax in DbConfig.validate()]
-* https://issues.couchbase.com//browse/CBG-1659[CBG-1659] -- https://issues.couchbase.com//browse/CBG-1659[SGCollect - Ensure it works / change for admin auth]
-* https://issues.couchbase.com//browse/CBG-1650[CBG-1650] -- https://issues.couchbase.com//browse/CBG-1650[sgcollect should get information from new endpoints (with include_runtime parameter, etc.)]
-* https://issues.couchbase.com//browse/CBG-1646[CBG-1646] -- https://issues.couchbase.com//browse/CBG-1646[Add a flag to non-active leaf revisions indicating whether they include v2 attachments]
-* https://issues.couchbase.com//browse/CBG-1643[CBG-1643] -- https://issues.couchbase.com//browse/CBG-1643[Add additional context for gocb errors when using self-signed cert]
-* https://issues.couchbase.com//browse/CBG-1642[CBG-1642] -- https://issues.couchbase.com//browse/CBG-1642[Detect legacy sg-replicate config and log accordingly]
-* https://issues.couchbase.com//browse/CBG-1635[CBG-1635] -- https://issues.couchbase.com//browse/CBG-1635[TestBucketPool V2 should close cluster when releasing/obtaining buckets]
-* https://issues.couchbase.com//browse/CBG-1590[CBG-1590] -- https://issues.couchbase.com//browse/CBG-1590[Retrieve existing doc metadata prior to calling downloadOrVerifyAttachments]
-* https://issues.couchbase.com//browse/CBG-1473[CBG-1473] -- https://issues.couchbase.com//browse/CBG-1473[Enable log redaction by default]
-* https://issues.couchbase.com//browse/CBG-1424[CBG-1424] -- https://issues.couchbase.com//browse/CBG-1424[discoverInterfaceName should resolve hostnames before trying to find network interface stats using IP addresses]
-* https://issues.couchbase.com//browse/CBG-1391[CBG-1391] -- https://issues.couchbase.com//browse/CBG-1391[Treat existing cbgt index as recoverable error]
-* https://issues.couchbase.com//browse/CBG-1390[CBG-1390] -- https://issues.couchbase.com//browse/CBG-1390[Add warning threshold for excessively large number of channels per user]
-* https://issues.couchbase.com//browse/CBG-1359[CBG-1359] -- https://issues.couchbase.com//browse/CBG-1359[Increase default minimum TLS version TLS1.2]
-* https://issues.couchbase.com//browse/CBG-1343[CBG-1343] -- https://issues.couchbase.com//browse/CBG-1343[Increase initial wait time for index creation retry]
-* https://issues.couchbase.com//browse/CBG-1342[CBG-1342] -- https://issues.couchbase.com//browse/CBG-1342[Avoid retry on 'duplicate index name' index creation error]
-* https://issues.couchbase.com//browse/CBG-1337[CBG-1337] -- https://issues.couchbase.com//browse/CBG-1337[Add an option to skip SSL certificates verification while loading JavaScript from HTTPS endpoints]
-* https://issues.couchbase.com//browse/CBG-1326[CBG-1326] -- https://issues.couchbase.com//browse/CBG-1326[Log if channels expand to a smaller set than requested]
-* https://issues.couchbase.com//browse/CBG-1299[CBG-1299] -- https://issues.couchbase.com//browse/CBG-1299[[Lithium Port] - Implement network connstr flag for cbdatasource alt address shims]
-* https://issues.couchbase.com//browse/CBG-1282[CBG-1282] -- https://issues.couchbase.com//browse/CBG-1282[XATTRS Access Grants]
-* https://issues.couchbase.com//browse/CBG-1280[CBG-1280] -- https://issues.couchbase.com//browse/CBG-1280[Channel Access Revocation]
-* https://issues.couchbase.com//browse/CBG-1273[CBG-1273] -- https://issues.couchbase.com//browse/CBG-1273[Add Prometheus alert examples]
-* https://issues.couchbase.com//browse/CBG-1253[CBG-1253] -- https://issues.couchbase.com//browse/CBG-1253[Add USE INDEX to index readiness queries]
-* https://issues.couchbase.com//browse/CBG-1251[CBG-1251] -- https://issues.couchbase.com//browse/CBG-1251[Support Apple (M1) Silicon]
-* https://issues.couchbase.com//browse/CBG-1245[CBG-1245] -- https://issues.couchbase.com//browse/CBG-1245[Include channel name in validfrom logging]
-* https://issues.couchbase.com//browse/CBG-1240[CBG-1240] -- https://issues.couchbase.com//browse/CBG-1240[Remove couchbase/ns_server dependency]
-* https://issues.couchbase.com//browse/CBG-1239[CBG-1239] -- https://issues.couchbase.com//browse/CBG-1239[Remove couchbase/retriever dependency]
-* https://issues.couchbase.com//browse/CBG-1232[CBG-1232] -- https://issues.couchbase.com//browse/CBG-1232[Add support for loading webhook filter JavaScript from external file or URL]
-* https://issues.couchbase.com//browse/CBG-1217[CBG-1217] -- https://issues.couchbase.com//browse/CBG-1217[Ensure change listener goroutines terminates (both Tap and DCP feeds) before the server is stopped]
-* https://issues.couchbase.com//browse/CBG-1170[CBG-1170] -- https://issues.couchbase.com//browse/CBG-1170[Upgrade to go 1.15]
-* https://issues.couchbase.com//browse/CBG-1127[CBG-1127] -- https://issues.couchbase.com//browse/CBG-1127[Treat resurrected tombstones as non-conflict when no shared history]
-* https://issues.couchbase.com//browse/CBG-949[CBG-949] -- https://issues.couchbase.com//browse/CBG-949[Improve error when non-upgradable HTTP request is sent to _blipsync endpoint]
-* https://issues.couchbase.com//browse/CBG-841[CBG-841] -- https://issues.couchbase.com//browse/CBG-841[Force users to opt in to accepting unsigned tokens from providers in SG's provider config.]
-* https://issues.couchbase.com//browse/CBG-715[CBG-715] -- https://issues.couchbase.com//browse/CBG-715[High CPU usage in high volume basic auth scenarios]
-* https://issues.couchbase.com//browse/CBG-641[CBG-641] -- https://issues.couchbase.com//browse/CBG-641[Admin API Auth]
-* https://issues.couchbase.com//browse/CBG-551[CBG-551] -- https://issues.couchbase.com//browse/CBG-551[Avoid storing _removed:true revision bodies in the revision cache]
 // end::Enhancements-3-0-0-beta[]
 // end::enhancements-300[]
 
@@ -149,31 +112,16 @@ xref:whatsnew.adoc#use-environment-variables-in-configuration-file[Read More ...
 
 // tag::known-300[]
 // .List of issues outstanding at this release
-* https://issues.couchbase.com//browse/CBG-798[CBG-798] -- https://issues.couchbase.com//browse/CBG-798[Sync Gateway requires Couchbase Server nodes to use the same SSL memcached port]
+include::partial$pn-issues-list.adoc[tags="KI-3-0-0-beta"]
+
 
 
 // end::known-300[]
 
-== Fixed Issues
+=== Fixed Issues
 // tag::fixed-300[]
 // tag::Fixed-3-0-0-beta[]
-
-* https://issues.couchbase.com//browse/CBG-1438[CBG-1438] -- https://issues.couchbase.com//browse/CBG-1438[SgwIntStat.SetIfMax incorrectly sums old and new values]
-* https://issues.couchbase.com//browse/CBG-1412[CBG-1412] -- https://issues.couchbase.com//browse/CBG-1412[JSON strings in some responses not being correctly escaped]
-* https://issues.couchbase.com//browse/CBG-1388[CBG-1388] -- https://issues.couchbase.com//browse/CBG-1388[sg_collect does not package archived log files (*.log.gz)]
-* https://issues.couchbase.com//browse/CBG-1376[CBG-1376] -- https://issues.couchbase.com//browse/CBG-1376[Some Delta Sync errors logged at WARN level should be DEBUG]
-* https://issues.couchbase.com//browse/CBG-1339[CBG-1339] -- https://issues.couchbase.com//browse/CBG-1339[Creating mobile tombstone for existing CBS tombstone causes loop]
-* https://issues.couchbase.com//browse/CBG-1335[CBG-1335] -- https://issues.couchbase.com//browse/CBG-1335[Mutating _rev on localDocument in conflict resolver results in merge error]
-* https://issues.couchbase.com//browse/CBG-1325[CBG-1325] -- https://issues.couchbase.com//browse/CBG-1325[Incorrect email validation (too strict)]
-* https://issues.couchbase.com//browse/CBG-1304[CBG-1304] -- https://issues.couchbase.com//browse/CBG-1304[ISGR: Pull replications incompatible with active-side allow_conflicts=false]
-* https://issues.couchbase.com//browse/CBG-1246[CBG-1246] -- https://issues.couchbase.com//browse/CBG-1246[Changes limit incorrectly applied in case of CBG-946]
-* https://issues.couchbase.com//browse/CBG-1231[CBG-1231] -- https://issues.couchbase.com//browse/CBG-1231[Prevent import cfg startup races]
-* https://issues.couchbase.com//browse/CBG-1200[CBG-1200] -- https://issues.couchbase.com//browse/CBG-1200[Calling DELETE on a non-existent document creates a tombstone with empty body]
-* https://issues.couchbase.com//browse/CBG-1172[CBG-1172] -- https://issues.couchbase.com//browse/CBG-1172[ISGR credentials with characters requiring URL encoding cause blipsync to fail]
-* https://issues.couchbase.com//browse/CBG-1161[CBG-1161] -- https://issues.couchbase.com//browse/CBG-1161[DefaultPurgeInterval specified in days and used as though in hours]
-* https://issues.couchbase.com//browse/CBG-1113[CBG-1113] -- https://issues.couchbase.com//browse/CBG-1113[CBL1.x/Websocket based changes feeds leak goroutine on disconnect]
-* https://issues.couchbase.com//browse/CBG-789[CBG-789] -- https://issues.couchbase.com//browse/CBG-789[Updating a blob with new data does not update SG's metadata on sync]
-
+include::partial$pn-issues-list.adoc[tags="Fixed-3-0-0-beta"]
 // end::Fixed-3-0-0-beta[]
 // end::fixed-300[]
 
@@ -185,11 +133,20 @@ xref:whatsnew.adoc#use-environment-variables-in-configuration-file[Read More ...
 // tbd
 // end::cfg-changed-300[]
 
-== Breaking Changes
+=== Deprecated
+include::partial$pn-issues-list.adoc[tags="Deprecated-3-0-0-beta"]
+
+=== Removed
+include::partial$pn-issues-list.adoc[tags="Removed-3-0-0-beta"]
+
+
+== API and Confiuration Changes
 // – identify any REST API changes
 // tag::api-changes-300[]
 // tag::all-changed-300-api[]
-This release introduces significant configuration and persistent API changes; some of which may be breaking changes if they impact a feature you rely on -- see the items identified in <<tbl-breaking>> | <<tbl-deprecated>> | <<tbl-dropped>>.
+This release introduces significant configuration and persistent API changes; some of which may be breaking changes if they impact a feature you rely on -- see the items identified in:attribute: value <<tbl-breaking>> |
+<<tbl-deprecated>> |
+<<tbl-dropped>>.
 
 === Breaks compatibility