diff --git a/app/data/vaccine-stock.js b/app/data/vaccine-stock.js
index 8b4866f3..fd63134c 100644
--- a/app/data/vaccine-stock.js
+++ b/app/data/vaccine-stock.js
@@ -229,7 +229,7 @@ module.exports = [
   },
   {
     id: "RFF47457436",
-    vaccine: "Hepatitis B",
+    vaccine: "hepatitis B",
     vaccineProduct: "Engerix B",
     organisationId: "RFF", // Barnsley Hospital NHS Foundation Trust
     siteId: "RFFPK", // Barnsley General Hospital
@@ -313,7 +313,7 @@ module.exports = [
   },
   {
     id: "RFF27326334",
-    vaccine: "Rotavirus",
+    vaccine: "rotavirus",
     vaccineProduct: "Rotarix",
     organisationId: "RFF", // Barnsley Hospital NHS Foundation Trust
     siteId: "RFFPK", // Barnsley General Hospital
@@ -327,7 +327,7 @@ module.exports = [
   },
   {
     id: "RFF25325355",
-    vaccine: "Shingles",
+    vaccine: "shingles",
     vaccineProduct: "Shingrix",
     organisationId: "RFF", // Barnsley Hospital NHS Foundation Trust
     siteId: "RFFPK", // Barnsley General Hospital
diff --git a/app/data/vaccines.js b/app/data/vaccines.js
index d7471fd8..280ea859 100644
--- a/app/data/vaccines.js
+++ b/app/data/vaccines.js
@@ -162,7 +162,7 @@ module.exports = [
     ]
   },
   {
-    name: "Hepatitis B",
+    name: "hepatitis B",
     products: [
       {
         name: "Engerix B",
@@ -240,7 +240,7 @@ module.exports = [
     ]
   },
   {
-    name: "Rotavirus",
+    name: "rotavirus",
     products: [
       {
         name: "Rotarix",
@@ -249,7 +249,7 @@ module.exports = [
     ]
   },
   {
-    name: "Shingles",
+    name: "shingles",
     products: [
       {
         name: "Shingrix",
diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js
index 086a8154..80dec065 100644
--- a/app/routes/record-vaccinations.js
+++ b/app/routes/record-vaccinations.js
@@ -861,12 +861,12 @@ module.exports = router => {
       redirectPath = "/record-vaccinations/add-batch"
     } else if (!vaccineBatch) {
       redirectPath = "/record-vaccinations/batch?showError=yes"
-    } else if (["COVID-19", "flu", "flu (London service)", "RSV", "pneumococcal"].includes(data.vaccine)) {
+    } else if (["COVID-19", "flu", "flu (London service)", "RSV", "pneumococcal", "3-in-1 teenage booster", "HPV", "MenACWY", "MenB", "shingles"].includes(data.vaccine)) {
       redirectPath = "/record-vaccinations/eligibility"
     } else if (data.vaccine === "pertussis") {
       redirectPath = "/record-vaccinations/patient-estimated-due-date"
     } else {
-      // MMR
+      // MMR, MMRV, 4-in-1, 6-in-1, rotavirus, BCG, hepatitis B
       redirectPath = "/record-vaccinations/consent"
     }
     res.redirect(redirectPath)
diff --git a/app/views/record-vaccinations/eligibility.html b/app/views/record-vaccinations/eligibility.html
index 574d4b67..7f8de9aa 100644
--- a/app/views/record-vaccinations/eligibility.html
+++ b/app/views/record-vaccinations/eligibility.html
@@ -45,20 +45,35 @@
   "Healthcare worker not covered by national criteria"
 ] %}
 
-{% set pneumococcalOver65Options = [
-  "Aged 65 and over"
+{% set pneumococcalEligibilityOptions = [
+  "Based on age",
+  "In an at-risk group"
+] %}
+
+{% set 3in1EligibilityOptions = [
+  "Based on age",
+  "In an at-risk group"
+] %}
+
+{% set HPVEligibilityOptions = [
+  "Based on age",
+  "In an at-risk group"
+] %}
+
+{% set MenACWYEligibilityOptions = [
+  "Based on age",
+  "In an at-risk group"
 ] %}
 
-{% set pneumococcalUnder65Options = [
-  "Heart disease",
-  "Kidney disease",
-  "Liver disease",
-  "Respiratory disease",
-  "Immunosuppressed",
-  "Cochlear implants",
-  "Diabetes"
+{% set MenBEligibilityOptions = [
+  "Based on age",
+  "In an at-risk group"
 ] %}
 
+{% set shinglesEligibilityOptions = [
+  "Based on age",
+  "In an at-risk group"
+] %}
 
 {% block content %}
   <div class="nhsuk-grid-row">
@@ -82,7 +97,17 @@
         {% elif data.vaccine == "RSV" %}
           {% set eligibilityOptions = RSVEligibilityOptions %}
         {% elif data.vaccine == "pneumococcal" %}
-          {% set eligibilityOptions = pneumococcalOver65Options %}
+          {% set eligibilityOptions = pneumococcalEligibilityOptions %}
+        {% elif data.vaccine == "3-in-1 teenage booster" %}
+          {% set eligibilityOptions = 3in1EligibilityOptions %}
+        {% elif data.vaccine == "HPV" %}
+          {% set eligibilityOptions = HPVEligibilityOptions %}
+        {% elif data.vaccine == "MenACWY" %}
+          {% set eligibilityOptions = MenACWYEligibilityOptions %}
+        {% elif data.vaccine == "MenB" %}
+          {% set eligibilityOptions = MenBEligibilityOptions %}
+        {% elif data.vaccine == "shingles" %}
+          {% set eligibilityOptions = shinglesEligibilityOptions %}
         {% else %}
           {% set eligibilityOptions = [] %}
         {% endif %}
@@ -103,36 +128,13 @@
           }
         }) %}
 
-          {% if data.vaccine == "pneumococcal" %}
-            <h2 class="nhsuk-u-font-size-19 nhsuk-u-margin-bottom-2 nhsuk-u-margin-top-3 nhsuk-u-font-weight-normal">Aged 65 and over</h2>
-          {% endif %}
-
-          {{ radios({
+        {{ radios({
             idPrefix: "eligibility",
             name: "eligibility",
             value: data.eligibility,
             items: items
           }) }}
-
-          {% if data.vaccine == "pneumococcal" %}
-            <h2 class="nhsuk-u-font-size-19 nhsuk-u-margin-bottom-2 nhsuk-u-margin-top-3 nhsuk-u-font-weight-normal">Aged 18 to 64 and in a clinical risk group</h2>
-
-            {% set pneumococcalUnder64Items = [] %}
-            {% for option in pneumococcalUnder65Options %}
-              {% set pneumococcalUnder64Items = (pneumococcalUnder64Items.push({
-                text: option,
-                value: option
-                }), pneumococcalUnder64Items) %}
-            {% endfor %}
-
-            {{ radios({
-              idPrefix: "eligibility2",
-              name: "eligibility",
-              value: data.eligibility,
-              items: pneumococcalUnder64Items
-            }) }}
-          {% endif %}
-
+          
         {% endcall %}
 
         {{ button({