diff --git a/package.json b/package.json
index f965aeb..86d916f 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@akala-modules/core": "^1.1.3",
     "@akala/client": "^2.0.71",
-    "@akala/server": "^2.1.12",
+    "@akala/server": "^3.0.21",
     "@domojs/theme-default": "^1.1.24",
     "@types/debug": "^4.1.0",
     "@types/ws": "^6.0.1",
diff --git a/yarn.lock b/yarn.lock
index bed5d1a..83d29d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -37,29 +37,17 @@
   optionalDependencies:
     showdown "^1.8.6"
 
-"@akala/core@^2.0.87":
-  version "2.0.87"
-  resolved "https://registry.yarnpkg.com/@akala/core/-/core-2.0.87.tgz#bf2f9afe4660c285b01643f4b831f9605652b9cc"
-  integrity sha512-gMCr1CSPw2E5nwnOzNzN/MNsk/8QUOJf2ga4fGweSKsbi6aVTG1JLEjCrCSpFnyzJ1NCMqWfG7vZCzHWkQbLfA==
+"@akala/commands@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@akala/commands/-/commands-0.1.2.tgz#c210ec54d39359e0527e5677f36699a533871085"
+  integrity sha512-z8C12QR5ig72aYr3Ba+Iklmf4BBQujaUewaWVvLzRiTPzFo9teX3s1vS89jC+Y6Zd9Ckhbdv3K2RnUWoe+Q8HQ==
   dependencies:
-    "@akala/json-rpc-ws" "^7.0.1"
-    array-flatten "^2.1.1"
-    browser-process-hrtime "^1.0.0"
-    debug "^4.1.1"
-    es6-promise "^4.2.4"
-    isomorphic-fetch "^2.2.1"
-    mock-require "^3.0.3"
-    orchestrator "^0.3.8"
-    parseurl "^1.3.1"
-    path-to-regexp "^3.0.0"
-    routington "^1.0.3"
-    utils-merge "^1.0.0"
-    ws "^6.1.3"
+    "@akala/core" "^2.0.97"
 
-"@akala/core@^2.0.96", "@akala/core@^2.0.97":
-  version "2.0.97"
-  resolved "https://registry.yarnpkg.com/@akala/core/-/core-2.0.97.tgz#31aeaba2041862d0077b1c651a39b86e0d6669b5"
-  integrity sha512-QpRIbFoJekcWLKle+xjropzlFgublT1PUt6nqjwHefewvsNXKVN/4zPM6Oge7zygy5LohDvYLk3x0y5C1NMeYg==
+"@akala/core@^2.0.87", "@akala/core@^2.0.96", "@akala/core@^2.0.97", "@akala/core@^2.0.98":
+  version "2.0.98"
+  resolved "https://registry.yarnpkg.com/@akala/core/-/core-2.0.98.tgz#0bc35308324ccbf7fc6805584b7b4c04cca20cec"
+  integrity sha512-sYVuZR9eSQEvYONE9LJuzpYaI2vQN74shWXMVsuaIur4qkwbsSXj8R8hdSK/7XFrzRuLXYPZgJnxuV66fYTNmQ==
   dependencies:
     "@akala/json-rpc-ws" "^7.0.1"
     array-flatten "^2.1.1"
@@ -84,7 +72,7 @@
     uuid "^3.3.2"
     ws "^6.0.0"
 
-"@akala/server@^2.1.12", "@akala/server@^2.1.6":
+"@akala/server@^2.1.6":
   version "2.1.41"
   resolved "https://registry.yarnpkg.com/@akala/server/-/server-2.1.41.tgz#385631d008826c143fee3b71f2c071ec6528bb87"
   integrity sha512-28q7c5DKWglblsPz6zZG7Rywt5Kw6fPlBfhxLalqwngTUSO1fK/I9DT+gNbNYfZhhaR6p9LavHfe3YjOyDX4EQ==
@@ -103,12 +91,13 @@
     ws "^7.1.1"
     xml2js "^0.4.19"
 
-"@akala/server@^3.0.12", "@akala/server@^3.0.19":
-  version "3.0.19"
-  resolved "https://registry.yarnpkg.com/@akala/server/-/server-3.0.19.tgz#84d4a7c07e779677348c801d7381956758834437"
-  integrity sha512-JOQmRSRWsQicG41lUK57GRvif4iDvu/7gbfACjg3vT8X+9VNyI2O51+wb0lbieK5PDa/4sbo6lnQjoTsNqDAew==
+"@akala/server@^3.0.12", "@akala/server@^3.0.19", "@akala/server@^3.0.21":
+  version "3.0.21"
+  resolved "https://registry.yarnpkg.com/@akala/server/-/server-3.0.21.tgz#220c095b6b0482bb01439479bf676d3bd8874fa4"
+  integrity sha512-eVUeedIA6I1WU+a1eIGEcKtyyGroZ125F3Q+w43H9K+plcBwm4r1x5ZaQFS8DLwXYp+ZqQzsxoOLKOCqOiNCBA==
   dependencies:
-    "@akala/core" "^2.0.97"
+    "@akala/commands" "^0.1.2"
+    "@akala/core" "^2.0.98"
     "@akala/json-rpc-ws" "^7.0.2"
     body-parser "^1.18.2"
     express "^4.16.2"
@@ -119,7 +108,7 @@
     sequencify "0.0.7"
     source-map-support "^0.5.13"
     underscore "^1.8.3"
-    ws "^7.1.1"
+    ws "^7.1.2"
     xml2js "^0.4.19"
 
 "@akala/storage@^1.0.12":
@@ -2975,10 +2964,10 @@ ws@^6.0.0, ws@^6.1.3:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.1.1.tgz#f9942dc868b6dffb72c14fd8f2ba05f77a4d5983"
-  integrity sha512-o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==
+ws@^7.1.1, ws@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.1.2.tgz#c672d1629de8bb27a9699eb599be47aeeedd8f73"
+  integrity sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==
   dependencies:
     async-limiter "^1.0.0"