diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessor.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessor.java
index c7444e3..ae52733 100644
--- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessor.java
+++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessor.java
@@ -71,6 +71,9 @@ private String buildButtonAttributes(Map<String, String> attributes) {
       buttonAttributes.append(" data-prevent-double-click=\"")
           .append(attributes.get("preventDoubleClick")).append("\"");
     }
+    if (attributes.containsKey("value")){
+      buttonAttributes.append(" value=\"").append(attributes.get("value")).append("\"");
+    }
     return buttonAttributes.toString();
   }
 
diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessorTest.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessorTest.java
index b04671e..40672aa 100644
--- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessorTest.java
+++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/ButtonElementTagProcessorTest.java
@@ -21,7 +21,7 @@ void shouldRenderGovukButton() {
         String renderedHtml = templateEngine.process("test-button", context);
         assertThat(renderedHtml)
                 .contains("<a href=\"/test\" role=\"button\" draggable=\"false\" class=\"govuk-button custom-class\" data-module=\"govuk-button\" id=\"button-id\">Click Me!</a>")
-                .contains("<button type=\"submit\"  disabled aria-disabled=\"true\" class=\"govuk-button\" data-module=\"govuk-button\" id=\"button-id\">Click Me!</button>");
+                .contains("<button type=\"submit\"  disabled aria-disabled=\"true\" value=\"find_address\" class=\"govuk-button\" data-module=\"govuk-button\" id=\"button-id\">Click Me!</button>");
 
     }
 
diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-button.html b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-button.html
index 5e682b7..1b3632d 100644
--- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-button.html
+++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-button.html
@@ -7,7 +7,7 @@
 
 <govuk:button th:text="'Click Me!'" href="/test" id="button-id" classes="custom-class"/>
 
-<govuk:button th:text="'Click Me!'" id="button-id" disabled/>
+<govuk:button th:text="'Click Me!'" id="button-id" value="find_address" disabled/>
 
 </body>
 </html>
\ No newline at end of file