diff --git a/src/views/address/address.njk b/src/views/address/address.njk
index f6cee4c86..1ef6daa8c 100644
--- a/src/views/address/address.njk
+++ b/src/views/address/address.njk
@@ -23,7 +23,7 @@
     {% include "../components/address-input-fields.njk" %}
     {{ yearFromField(ctx, { name: "addressYearFrom", title: title, label: label }) }}
 
-    {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.next")}) }}
+    {{ hmpoSubmit(ctx, {attributes: {"data-nav": true, "data-link": "/undefined"}, id: "continue", text: translate("buttons.next")}) }}
 
   {% endcall %}
 
diff --git a/src/views/address/results.njk b/src/views/address/results.njk
index 0d09af940..fa9ebf3b6 100644
--- a/src/views/address/results.njk
+++ b/src/views/address/results.njk
@@ -24,7 +24,7 @@
 
     {{ hmpoHtml(translate("links.cantFindAddress")) }}
 
-    {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.select-address")}) }}
+    {{ hmpoSubmit(ctx, {id: "continue", attributes: {"data-nav": true, "data-link": "/undefined"}, text: translate("buttons.select-address")}) }}
 
   {% endcall %}
 
diff --git a/src/views/address/search.njk b/src/views/address/search.njk
index 2318b87bc..92d40da75 100644
--- a/src/views/address/search.njk
+++ b/src/views/address/search.njk
@@ -32,7 +32,10 @@
       autocomplete: "postal-code"
     }) }}
 
-    {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.find-address")}) }}
+    {{ hmpoSubmit(ctx, {
+      id: "continue",
+      attributes: { "data-nav": true, "data-link": "/results" }, 
+      text: translate("buttons.find-address")}) }}
     {%- include "../components/continue-submit-spinner.njk" -%}
 
   {% endcall %}
diff --git a/src/views/components/address-confirm.njk b/src/views/components/address-confirm.njk
index f86d138da..2bff609cd 100644
--- a/src/views/components/address-confirm.njk
+++ b/src/views/components/address-confirm.njk
@@ -151,9 +151,11 @@
         text: translate("pages.address-confirm.buttons.next"),
         id: "continue",
         attributes: {
-        "data-id": "next"
-      }
-    }) }}
+        "data-id": "next",
+        "data-nav": true,
+        "data-link": "/undefined"
+        }
+      }) }}
     {%- include "../components/continue-submit-spinner.njk" -%}
 
   {% endcall %}
diff --git a/src/views/components/address-problem-field.njk b/src/views/components/address-problem-field.njk
index a758dc285..fd35fa093 100644
--- a/src/views/components/address-problem-field.njk
+++ b/src/views/components/address-problem-field.njk
@@ -19,7 +19,7 @@
     })
   }}
 
-  {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.next")}) }}
+  {{ hmpoSubmit(ctx, {attributes: {"data-nav": true, "data-link": "/undefined"}, id: "continue", text: translate("buttons.next")}) }}
 
  {{hmpoHtml(translate("links.helpContact"))}}
 
diff --git a/src/views/previous/address.njk b/src/views/previous/address.njk
index cfbda2ae2..951e34d38 100644
--- a/src/views/previous/address.njk
+++ b/src/views/previous/address.njk
@@ -17,7 +17,7 @@
 
     {% include "../components/address-input-fields.njk" %}
 
-    {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.next")}) }}
+    {{ hmpoSubmit(ctx, {attributes: {"data-nav": true, "data-link": "/undefined"}, id: "continue", text: translate("buttons.next")}) }}
 
   {% endcall %}
   {{ ga4OnPageLoad({
diff --git a/src/views/previous/results.njk b/src/views/previous/results.njk
index 54ecda932..4aba050cc 100644
--- a/src/views/previous/results.njk
+++ b/src/views/previous/results.njk
@@ -25,7 +25,7 @@
 
     {{ hmpoHtml(translate("links.previous.cantFindAddress")) }}
 
-    {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.select-address")}) }}
+    {{ hmpoSubmit(ctx, {attributes: {"data-nav": true, "data-link": "/previous-address-check"}, id: "continue", text: translate("buttons.select-address")}) }}
 
   {% endcall %}
 
diff --git a/src/views/previous/search.njk b/src/views/previous/search.njk
index 089062ca1..549027e45 100644
--- a/src/views/previous/search.njk
+++ b/src/views/previous/search.njk
@@ -22,7 +22,7 @@
       hint:  translate("fields.addressSearch.previous.hint")
     }) }}
 
-    {{ hmpoSubmit(ctx, {id:"continue", text: translate("buttons.find-address")}) }}
+    {{ hmpoSubmit(ctx, {id:"continue", attributes: {"data-nav": true, "data-link": "/previous-results"}, text: translate("buttons.find-address")}) }}
 
   {% endcall %}