diff --git a/preview-src/docs-roles.adoc b/preview-src/docs-roles.adoc
index 59e6c2c7..7c71c2c8 100644
--- a/preview-src/docs-roles.adoc
+++ b/preview-src/docs-roles.adoc
@@ -13,6 +13,12 @@ Flags sections as Not Available on Aura, Aura DB Enterprise, Enterprise Edition,
 --
 
 
+[role=label--new-5.11 label--beta-until-5.12]
+== Beta until
+
+Lorem ipsum.
+
+
 [role="label--new-5.17 label--enterprise-edition"]
 == Relationship property type constraints
 
diff --git a/src/css/labels.css b/src/css/labels.css
index c7e925da..5383edae 100644
--- a/src/css/labels.css
+++ b/src/css/labels.css
@@ -167,7 +167,8 @@ span.label--yes {
 }
 
 span.label--alpha,
-span.label--beta {
+span.label--beta,
+span.label--beta-until {
   background: var(--alpha-beta-background-color);
   color: var(--alpha-beta-color);
 }
diff --git a/src/js/60-docs-roles.js b/src/js/60-docs-roles.js
index 19527fbc..4e9b3c92 100644
--- a/src/js/60-docs-roles.js
+++ b/src/js/60-docs-roles.js
@@ -27,7 +27,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     // label could be eg aura-db-enterprise - we use the full label
     // label could be eg new-5.20 - we use 'new' for the label and add the version as text
-    label = (rolesData[label] && rolesData[label].category !== 'version') ? label : labelParts[0]
+    label = (rolesData[label] && rolesData[label].labelCategory !== 'version') ? label : labelParts.slice(0, -1).join('-')
 
     // ignore labels that are not defined in rolesData
     if (!rolesData[label]) {
@@ -47,7 +47,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     // get version number for version labels
     if ((rolesData[label].labelCategory === 'version' || rolesData[label].versionText) && labelParts[1]) {
-      labelDetails.data.version = labelParts[1]
+      labelDetails.data.version = labelParts.pop()
       const joinText = rolesData[label].versionText ? rolesData[label].versionText : 'in'
       labelDetails.text = [labelDetails.text, joinText, labelDetails.data.version].join(' ')
     }
diff --git a/src/js/data/rolesData.json b/src/js/data/rolesData.json
index 1fd9ac78..54b6df2d 100644
--- a/src/js/data/rolesData.json
+++ b/src/js/data/rolesData.json
@@ -140,6 +140,12 @@
         "labelCategory": "version",
         "displayText": "Beta"
     },
+    "beta-until":{
+        "description": "The feature or function was in beta until the version specified",
+        "labelCategory": "version",
+        "displayText": "Beta",
+        "versionText": "until"
+    },
     "deprecated":{
         "labelCategory": "version",
         "displayText": "Deprecated"