diff --git a/CHANGELOG.md b/CHANGELOG.md
index 940b195b1..7980614d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)
 
+# v5.87 2021-12-19 WeKan ® release
+
+This release adds the following updates:
+
+- [Changed Docker base image to ubuntu:rolling](https://github.com/wekan/wekan/commit/8446640060e6e5058d0d186d71831a32a9e606e3).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.86 2021-12-19 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Fix: BoardAdmin can't edit or delete others comments on cards](https://github.com/wekan/wekan/pull/4248).
+  Thanks to Ben0it-T.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v5.85 2021-12-17 WeKan ® release
 
 This release adds the following updates:
diff --git a/Dockerfile b/Dockerfile
index cb4dc9d72..c82283d97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/wekan/ubuntu:impish-20211102
+FROM ubuntu:rolling
 LABEL maintainer="wekan"
 
 # 2021-09-18:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 47bbea0c1..2ba483b18 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v5.85.0"
+appVersion: "v5.87.0"
 files:
   userUploads:
     - README.md
diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml
index 0350a7b89..68de41335 100644
--- a/helm/wekan/Chart.yaml
+++ b/helm/wekan/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "5.85"
+appVersion: "5.87"
 dependencies:
   - condition: mongodb.enabled
     name: mongodb
diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml
index dc0438144..50757f717 100644
--- a/helm/wekan/values.yaml
+++ b/helm/wekan/values.yaml
@@ -14,7 +14,7 @@ serviceAccounts:
 ##
 image:
   repository: quay.io/wekan/wekan
-  tag: v5.85
+  tag: v5.87
   pullPolicy: IfNotPresent
 
 ## Configuration for wekan component
diff --git a/models/cardComments.js b/models/cardComments.js
index 8dbd437e2..f8c860704 100644
--- a/models/cardComments.js
+++ b/models/cardComments.js
@@ -75,10 +75,10 @@ CardComments.allow({
     return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
   },
   update(userId, doc) {
-    return userId === doc.userId;
+    return userId === doc.userId || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
   },
   remove(userId, doc) {
-    return userId === doc.userId;
+    return userId === doc.userId || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
   },
   fetch: ['userId', 'boardId'],
 });
diff --git a/package-lock.json b/package-lock.json
index 59d0a8812..cfd0c71ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.85.0",
+  "version": "v5.87.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4ea9fc8bf..f3542ecca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.85.0",
+  "version": "v5.87.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {
diff --git a/public/api/wekan.html b/public/api/wekan.html
index 063b18baf..7a2df1473 100644
--- a/public/api/wekan.html
+++ b/public/api/wekan.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v5.85</title>
+    <title>Wekan REST API v5.87</title>
 
     <style>
     </style>
@@ -1555,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.85">Wekan REST API v5.85</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.87">Wekan REST API v5.87</a>
             
           </li>
         
@@ -2128,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v5.85</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v5.87</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>
diff --git a/public/api/wekan.yml b/public/api/wekan.yml
index 403b2db4a..64b4565cc 100644
--- a/public/api/wekan.yml
+++ b/public/api/wekan.yml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v5.85
+  version: v5.87
   description: |
     The REST API allows you to control and extend Wekan with ease.
 
diff --git a/releases/release-bundle.sh b/releases/release-bundle.sh
index 309c041a0..65518c2b1 100755
--- a/releases/release-bundle.sh
+++ b/releases/release-bundle.sh
@@ -6,11 +6,11 @@ cd ~/repos/wekan/.build
 zip -r wekan-$1.zip bundle
 
 {
-  scp ~/repos/wekan/releases/maintainer-make-bundle-a.sh a:/home/wekan/repos/maintainer-make-bundle.sh
+  scp ~/repos/wekan/releases/maintainer-make-bundle-a.sh a:/home/wekan/maintainer-make-bundle.sh
   scp ~/repos/wekan/releases/maintainer-make-bundle-s.sh s:/home/linux1/maintainer-make-bundle.sh
   scp ~/repos/wekan/releases/maintainer-make-bundle-o.sh o:/home/ubuntu/maintainer-make-bundle.sh
   scp wekan-$1.zip x2:/var/snap/wekan/common/releases.wekan.team/
-  scp wekan-$1.zip a:/home/wekan/repos/
+  scp wekan-$1.zip a:/home/wekan/
   scp wekan-$1.zip s:/home/linux1/
   scp wekan-$1.zip o:/home/ubuntu/
 } | parallel -k
diff --git a/releases/up-a.sh b/releases/up-a.sh
index 7eebc9270..019ab34ca 100755
--- a/releases/up-a.sh
+++ b/releases/up-a.sh
@@ -11,7 +11,7 @@ if [ $# -ne 1 ]
 fi
 
 # 2) Download release from arm64 build server
-scp a:/home/wekan/repos/wekan-$1-arm64.zip .
+scp a:/home/wekan/wekan-$1-arm64.zip .
 
 # 3) Upload arm64 release to download server
 scp wekan-$1-arm64.zip x2:/var/snap/wekan/common/releases.wekan.team/raspi3/
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 296231b50..42503d69a 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 585,
+    appVersion = 587,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "5.85.0~2021-12-17"),
+    appMarketingVersion = (defaultText = "5.87.0~2021-12-19"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 47a77f4c1..afdc3220e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: wekan
-version: '5.85'
+version: '5.87'
 summary: Open Source kanban
 description: |
    WeKan ® is an Open Source and collaborative kanban board application.