diff --git a/src/main/java/org/quarkus/samples/petclinic/Temporals.java b/src/main/java/org/quarkus/samples/petclinic/Temporals.java
new file mode 100644
index 0000000..7ec7756
--- /dev/null
+++ b/src/main/java/org/quarkus/samples/petclinic/Temporals.java
@@ -0,0 +1,22 @@
+package org.quarkus.samples.petclinic;
+
+import io.quarkus.qute.TemplateExtension;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * This is a temporary hack around
+ * <a href="https://github.com/redhat-developer-demos/quarkus-petclinic/issues/7">this</a> issue.
+ * <p>
+ * The problem appears to be M1 specific and is being
+ * <a href="https://quarkusio.zulipchat.com/#narrow/stream/187038-dev/topic/petclinic">looked</a> into by the Quarkus devs.
+ */
+@TemplateExtension
+public class Temporals {
+
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    public static String format(LocalDate localDate) {
+        return localDate.format(FORMATTER);
+    }
+}
diff --git a/src/main/resources/templates/createOrUpdateVisitForm.html b/src/main/resources/templates/createOrUpdateVisitForm.html
index 9ab4e56..4d381f6 100644
--- a/src/main/resources/templates/createOrUpdateVisitForm.html
+++ b/src/main/resources/templates/createOrUpdateVisitForm.html
@@ -17,7 +17,7 @@ <h2>
     </thead>
     <tr>
         <td>{pet.name}</td>
-        <td>{pet.birthDate.format('yyyy-MM-dd')}</td>
+        <td>{pet.birthDate.format()}</td>
         <td>{pet.type.name}</td>
         <td>{pet.owner.firstName} {pet.owner.lastName}</td>
     </tr>
@@ -74,7 +74,7 @@ <h2>
     <tr>
         {#if visit}
         {#for v in pet.visits}
-        <td>{v.date.format('yyyy-MM-dd')}</td>
+        <td>{v.date.format()}</td>
         <td>{v.description}</td>
         {/for}
         {/if}
diff --git a/src/main/resources/templates/ownerDetails.html b/src/main/resources/templates/ownerDetails.html
index 264b956..6dc2039 100644
--- a/src/main/resources/templates/ownerDetails.html
+++ b/src/main/resources/templates/ownerDetails.html
@@ -42,7 +42,7 @@ <h2>{msg:pets_and_visits}</h2>
             <dt>{msg:name}</dt>
             <dd>{pet.name}</dd>
             <dt>{msg:birthdate}</dt>
-            <dd>{pet.birthDate.format('yyyy-MM-dd')}</dd>
+            <dd>{pet.birthDate.format()}</dd>
             <dt>{msg:type}</dt>
             <dd>{pet.type.stringify}</dd>
           </dl>
@@ -62,7 +62,7 @@ <h2>{msg:pets_and_visits}</h2>
             </thead>
             {#for visit in pet.visits}
             <tr>
-              <td>{visit.date.format('yyyy-MM-dd')}</td>
+              <td>{visit.date.format()}</td>
               <td>{visit.description ?: ''}</td>
             </tr>
             {/for}