diff --git a/packages/app/package.json b/packages/app/package.json
index c81a6b0e..24028d3a 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -15,7 +15,7 @@
     "license": "BSD-3-Clause",
     "private": false,
     "dependencies": {
-        "@dhis2/cli-app-scripts": "^8.3.0",
+        "@dhis2/cli-app-scripts": "^8.3.1",
         "@dhis2/cli-helpers-engine": "^3.1.0"
     },
     "publishConfig": {
diff --git a/yarn.lock b/yarn.lock
index 06bc0884..fa60731d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2320,12 +2320,12 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/app-adapter@8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-8.3.0.tgz#da938ed9425adb2b88cbdb21f0401ac77c7fa8e4"
-  integrity sha512-8JIdoWka8HrgE2lR0Phy7y4kIOwY9LrpYK+5EmcfgQlT6zrYvFUwN2DBcixhIYRjBZ+g4p6U9M9bJmjNc3hbyw==
+"@dhis2/app-adapter@8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-8.3.1.tgz#b1297526423b6b29f375cfb1086c4681db955e8e"
+  integrity sha512-HHrgOl+zU76bidVo8PFs8LPPDbzPvtdjHk8FPhpIRQmesDJowGlUwllYF+gYtaqrhEAAQASK8KVv6+TEAUOnyQ==
   dependencies:
-    "@dhis2/pwa" "8.3.0"
+    "@dhis2/pwa" "8.3.1"
     moment "^2.24.0"
 
 "@dhis2/app-runtime@^3.2.3":
@@ -2362,15 +2362,15 @@
   dependencies:
     lodash "^4.17.21"
 
-"@dhis2/app-shell@8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-8.3.0.tgz#96b280ec920e66d51685fb5244dd7915d6e0afde"
-  integrity sha512-gZAA29xykxO3BRWrddygP+T4jWojhavV3P9v5PBNbH8cyABMUM9o7zB8qdE3rh03WwV65ZlU/wi7/ffgG4dn9g==
+"@dhis2/app-shell@8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-8.3.1.tgz#503eb1c8581e68671ef8e380af349448d686db6e"
+  integrity sha512-UzQDbTrhQ31gz/DG56c9PaDW9Sly2oZwvtIbUb5cbt52CgvyDHlNX6IoikQpzMh/NZkWmwsDV6rMjc/lpTv7Eg==
   dependencies:
-    "@dhis2/app-adapter" "8.3.0"
+    "@dhis2/app-adapter" "8.3.1"
     "@dhis2/app-runtime" "^3.2.3"
     "@dhis2/d2-i18n" "^1.1.0"
-    "@dhis2/pwa" "8.3.0"
+    "@dhis2/pwa" "8.3.1"
     "@dhis2/ui" "^7.2.0"
     classnames "^2.2.6"
     moment "^2.29.1"
@@ -2383,10 +2383,10 @@
     typeface-roboto "^0.0.75"
     typescript "^3.6.3"
 
-"@dhis2/cli-app-scripts@^8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-8.3.0.tgz#110d70044a2ce685b062a6b9df683aff48259ef2"
-  integrity sha512-0wW7UD4KTXl9Mbta5ogyt4ZmVABpojsJdQP5PdcJFI4xz++ngxEPK8AO76v8RdajviljWNITpDGnNnA4irlHDw==
+"@dhis2/cli-app-scripts@^8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-8.3.1.tgz#dce6dba4586de333310279290e80d01508ed08f6"
+  integrity sha512-afKb8hXBLwRK3cvmOK0Rq9cFy7AxsdXuceOJAw2lPiIhNNsWtrPuJ+X7OITKIhQmQrFI0f1vlkE2MfDvxQUwgQ==
   dependencies:
     "@babel/core" "^7.6.2"
     "@babel/plugin-proposal-class-properties" "^7.8.3"
@@ -2395,7 +2395,7 @@
     "@babel/preset-env" "^7.14.7"
     "@babel/preset-react" "^7.0.0"
     "@babel/preset-typescript" "^7.6.0"
-    "@dhis2/app-shell" "8.3.0"
+    "@dhis2/app-shell" "8.3.1"
     "@dhis2/cli-helpers-engine" "^3.0.0"
     "@jest/core" "^27.0.6"
     "@yarnpkg/lockfile" "^1.1.0"
@@ -2450,22 +2450,7 @@
     update-notifier "^3.0.0"
     yargs "^13.1.0"
 
-"@dhis2/cli-helpers-engine@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-3.0.0.tgz#dacddea16de7e5e60280aefbee2e5661795b78b3"
-  integrity sha512-e8cZFFsunQp56iLx1FKBWGZ1tmWOjdbqJaBwOnzvsKPyYopV9RzNcPm+HIBwfnCjHBWoWTf6ijaf3xVnimZC2w==
-  dependencies:
-    chalk "^3.0.0"
-    cross-spawn "^7.0.3"
-    find-up "^5.0.0"
-    fs-extra "^8.0.1"
-    inquirer "^7.3.3"
-    request "^2.88.0"
-    tar "^4.4.8"
-    update-notifier "^3.0.0"
-    yargs "^13.1.0"
-
-"@dhis2/cli-helpers-engine@^3.1.0":
+"@dhis2/cli-helpers-engine@^3.0.0", "@dhis2/cli-helpers-engine@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-3.1.0.tgz#9584e7ecb35dd2f1d2650164d8637fed71d225b9"
   integrity sha512-nKpuGjP+eEuovrtskDco5bfCew7jTcJZhDmAyfK7sZVhI7SNEPXH8vIHFPXWduROOFoAmxvLiyW6WiVfu9X6tA==
@@ -2565,10 +2550,10 @@
   resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.0.0.tgz#a17dd1b8475ab7e4e66c736624ac83fd372876af"
   integrity sha512-Crqimyk6XTJWWqmVZ+Asnle3OgOXsnUYVM2ozC+Z6Ad0O0M3I4lE2QS6V20nGEmUDl3K1Vri9lzmL8vAMpUBsw==
 
-"@dhis2/pwa@8.3.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-8.3.0.tgz#26f2bce13cf87fc911edabe5afd01bb4e549441d"
-  integrity sha512-ADP2ri5zVjkugPIa+epp/ZBZ2DOe4Pq8PPsis6clfdCGQynygX6LB4VMBwFTfixHcHjvVaVMUWXdSggLlj3HBg==
+"@dhis2/pwa@8.3.1":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-8.3.1.tgz#1257427582f35a5143bcfe576aa694da23f964cb"
+  integrity sha512-94womNKxCzU2Qm2dHfDWStydOXw7YrXLSOI2sgYhzfuI1V3B2okDVdUi5EASD+p2d+ZQVM+qtmhThbU9RUdzzw==
   dependencies:
     idb "^6.0.0"
     workbox-core "^6.1.5"
@@ -17653,10 +17638,8 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
-    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
-    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"