diff --git a/addons/message_update_v2.17/enable.js b/addons/message_update_v2.18/enable.js
similarity index 89%
rename from addons/message_update_v2.17/enable.js
rename to addons/message_update_v2.18/enable.js
index 4c3da87eb0..acc8b613ad 100644
--- a/addons/message_update_v2.17/enable.js
+++ b/addons/message_update_v2.18/enable.js
@@ -1,6 +1,6 @@
 (function (api) {
   // "Extra" fields are used only to get a localized string.
-  api.addon.composer.remove('extra_1_217');
+  api.addon.composer.remove('extra_1');
 
   if (('updateTime' in api.settings)) {
     api.addon.date = (api.settings.updateTime.getTime() / 1000);
@@ -10,7 +10,7 @@
   // Macos v2.16.0 requires a web-based update.
   if (api.env.platform === 'macos' && api.env.versionString === '2.16.0') {
     api.addon.setTitle(
-        'message.message_update_v2.17.block.extra_1_217',
+        'message.message_update_v2.18.block.extra_1',
         'Download the new Mozilla VPN');
     api.addon.composer.remove('c_3');
     return;
@@ -51,6 +51,6 @@
   api.addon.composer.remove('c_3');
 
   api.addon.setTitle(
-      'message.message_update_v2.17.block.extra_1_217',
+      'message.message_update_v2.18.block.extra_1',
       'Download the new Mozilla VPN');
 })
diff --git a/addons/message_update_v2.17/getHelp.js b/addons/message_update_v2.18/getHelp.js
similarity index 100%
rename from addons/message_update_v2.17/getHelp.js
rename to addons/message_update_v2.18/getHelp.js
diff --git a/addons/message_update_v2.17/manifest.json b/addons/message_update_v2.18/manifest.json
similarity index 76%
rename from addons/message_update_v2.17/manifest.json
rename to addons/message_update_v2.18/manifest.json
index 552d56fb6b..dba1447a85 100644
--- a/addons/message_update_v2.17/manifest.json
+++ b/addons/message_update_v2.18/manifest.json
@@ -1,18 +1,18 @@
 {
   "api_version": "0.1",
-  "id": "message_update_v2.17",
-  "name": "Update to Mozilla VPN 2.17",
+  "id": "message_update_v2.18",
+  "name": "Update to Mozilla VPN 2.18",
   "type": "message",
   "conditions": {
-    "max_client_version": "2.16.9"
+    "max_client_version": "2.17.9"
   },
   "javascript": {
     "enable": "enable.js"
   },
   "message": {
     "date": 1671066000,
-    "id": "message_update_v2.17",
-    "title": "Update Mozilla VPN",
+    "id": "message_update_v2.18",
+    "title": "Update to Mozilla VPN 2.18",
     "subtitle": "We’ve released an updated version of Mozilla VPN! Update to the latest version for the best possible Mozilla VPN experience.",
     "badge": "new_update",
     "blocks": [
@@ -27,7 +27,7 @@
         "content": [
           {
             "id": "l_2",
-            "content": "A new “My Devices” screen that makes it easier to view and manage your devices"
+            "content": "The ability to upgrade to an annual plan from within the app"
           }
         ]
       },    
@@ -53,9 +53,9 @@
         "javascript": "getHelp.js"
       },
       {
-        "id": "extra_1_217",
+        "id": "extra_1",
         "type": "text",
-        "content": "Download the new Mozilla VPN"
+        "content": "Download the new Mozilla VPN 2.18"
       }
     ]
   }
diff --git a/addons/message_update_v2.17/update.js b/addons/message_update_v2.18/update.js
similarity index 100%
rename from addons/message_update_v2.17/update.js
rename to addons/message_update_v2.18/update.js
diff --git a/addons/message_update_v2.17/updateWeb.js b/addons/message_update_v2.18/updateWeb.js
similarity index 100%
rename from addons/message_update_v2.17/updateWeb.js
rename to addons/message_update_v2.18/updateWeb.js