diff --git a/CHANGELOG.md b/CHANGELOG.md
index 158a39185..bd4ff9b84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.18.2](https://github.com/dhis2/app-hub/compare/v2.18.1...v2.18.2) (2021-05-04)
+
+
+### Bug Fixes
+
+* use punycode.toASCII instead of punycode.encode ([#471](https://github.com/dhis2/app-hub/issues/471)) ([857a180](https://github.com/dhis2/app-hub/commit/857a180ba13a80caa70a381f19a3cdbeee9c2b41))
+
 ## [2.18.1](https://github.com/dhis2/app-hub/compare/v2.18.0...v2.18.1) (2021-04-30)
 
 
diff --git a/client/package.json b/client/package.json
index 19e007cf2..8b84f97d5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "client",
-    "version": "2.18.1",
+    "version": "2.18.2",
     "description": "The App Hub Client",
     "main": "src/index.js",
     "repository": "https://github.com/dhis2/app-hub",
diff --git a/package.json b/package.json
index e63e2a69a..6b321e56a 100644
--- a/package.json
+++ b/package.json
@@ -34,5 +34,5 @@
     "cypress-cucumber-preprocessor": {
         "nonGlobalStepDefinitions": true
     },
-    "version": "2.18.1"
+    "version": "2.18.2"
 }
diff --git a/server/package.json b/server/package.json
index 31c86534b..99727f9b5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "server",
-    "version": "2.18.1",
+    "version": "2.18.2",
     "description": "The App Hub Server",
     "main": "src/main.js",
     "repository": "https://github.com/dhis2/app-hub",
diff --git a/tools/package.json b/tools/package.json
index a9bfa49fa..1c75b93bb 100644
--- a/tools/package.json
+++ b/tools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tools",
-    "version": "2.18.1",
+    "version": "2.18.2",
     "description": "",
     "main": "clone.js",
     "repository": "https://github.com/dhis2/app-hub",