diff --git a/handlers/about_handler.go b/handlers/about_handler.go
index 5f8a1dd..1d628e0 100644
--- a/handlers/about_handler.go
+++ b/handlers/about_handler.go
@@ -25,7 +25,7 @@ func AboutHandler(content embed.FS) http.HandlerFunc {
 		}
 
 		// Execute the template with the provided data
-		data := map[string]interface{}{
+		data := map[string]any{
 			"Title": "Dungeons & Dragons Monster Generator",
 		}
 		err = tmpl.ExecuteTemplate(w, "about", data)
diff --git a/handlers/contact_handler.go b/handlers/contact_handler.go
index a01cad4..611abc2 100644
--- a/handlers/contact_handler.go
+++ b/handlers/contact_handler.go
@@ -23,7 +23,7 @@ func ContactHandler(content embed.FS) http.HandlerFunc {
 		}
 
 		// Execute the contact template
-		err = tmpl.ExecuteTemplate(w, "contact", map[string]interface{}{
+		err = tmpl.ExecuteTemplate(w, "contact", map[string]any{
 			"Title": "Dungeons & Dragons Monster Generator",
 		})
 		if err != nil {
diff --git a/handlers/form_handler.go b/handlers/form_handler.go
index c31cee4..1232463 100644
--- a/handlers/form_handler.go
+++ b/handlers/form_handler.go
@@ -42,7 +42,7 @@ func FormHandler(content embed.FS, monsters *[]model.Monster) http.HandlerFunc {
 		}
 
 		// Execute the template and render the response.
-		data := map[string]interface{}{
+		data := map[string]any{
 			"Title":    "Dungeons & Dragons Monster Generator",
 			"Monsters": *monsters,
 		}
diff --git a/handlers/main_handler.go b/handlers/main_handler.go
index f060e3b..e4b575e 100644
--- a/handlers/main_handler.go
+++ b/handlers/main_handler.go
@@ -28,7 +28,7 @@ func MainHandler(content embed.FS, monsters *[]model.Monster) http.HandlerFunc {
 		defer mu.Unlock()
 
 		// Execute the main template with the provided data
-		err = tmpl.ExecuteTemplate(w, "main", map[string]interface{}{
+		err = tmpl.ExecuteTemplate(w, "main", map[string]any{
 			"Title":    "Dungeons & Dragons Monster Generator",
 			"Monsters": *monsters,
 		})
diff --git a/handlers/monster_table_handler.go b/handlers/monster_table_handler.go
index 4755386..f227962 100644
--- a/handlers/monster_table_handler.go
+++ b/handlers/monster_table_handler.go
@@ -24,7 +24,7 @@ func MonsterTableHandler(content embed.FS, monsters *[]model.Monster) http.Handl
 		}
 
 		// Execute the template and pass the necessary data
-		err = tmpl.ExecuteTemplate(w, "monsterTable", map[string]interface{}{
+		err = tmpl.ExecuteTemplate(w, "monsterTable", map[string]any{
 			"Title":    "Dungeons & Dragons Monster Generator",
 			"Monsters": *monsters,
 		})