diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout
index 0adadf190f..d2cef14933 100644
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
@@ -53,32 +53,22 @@ NoStyle				Chapter
 NoCounter			chapter
 NoStyle				Chapter*
 
-
-Style BeginFrontmatter
-	Margin			Dynamic
-	LatexType		Command
-	LatexName		begin{frontmatter}
-	Category		FrontMatter
-	KeepEmpty		1
-	ParSkip			0.4
-	Align			Block
-	LabelSep		xx
-	LabelType		Static
-	LabelString		"Begin frontmatter"
+InsetLayout "Flex:Frontmatter"
+	LyXType			custom
+	LabelString		"Frontmatter"
+	LatexType		Environment
+	LatexName		frontmatter
+	Display			true
+	Decoration		Classic
+	KeepEmpty		true
+	MultiPar		true
+	ResetsFont		true
 	LabelFont
 	  Series		Bold
 	  Color			Green
 	EndFont
 End
 
-
-Style EndFrontmatter
-	CopyStyle		BeginFrontmatter
-	LatexName		end{frontmatter}
-	LabelString		"End frontmatter"
-End
-
-
 Style Title
 	Margin			Static
 	LatexType		Command
@@ -99,7 +89,6 @@ Style Title
 	HTMLTitle		true
 End
 
-
 InsetLayout "Flex:Titlenotemark"
 	LyxType			custom
 	LatexType		command
diff --git a/lib/templates/elsarticle.lyx b/lib/templates/elsarticle.lyx
index 9887cfdcc1..1b8346e220 100644
--- a/lib/templates/elsarticle.lyx
+++ b/lib/templates/elsarticle.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 544
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 556
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -20,7 +20,7 @@ theorems-std
 \language english
 \language_package default
 \inputencoding auto
-\fontencoding global
+\fontencoding auto
 \font_roman "default" "default"
 \font_sans "default" "default"
 \font_typewriter "default" "default"
@@ -38,6 +38,8 @@ theorems-std
 \output_sync 0
 \bibtex_command bibtex
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -140,19 +142,10 @@ http://www.ctan.org/get/macros/latex/contrib/elsarticle/elsdoc.pdf
 
 \end_layout
 
-\begin_layout BeginFrontmatter
-\begin_inset Note Note
+\begin_layout Standard
+\begin_inset Flex Frontmatter
 status open
 
-\begin_layout Plain Layout
-Keep this empty!
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Title
 This is a specimen title
 \begin_inset Flex Titlenotemark
@@ -689,14 +682,6 @@ MSC
 
 \end_layout
 
-\begin_layout EndFrontmatter
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-Keep this empty!
-\end_layout
-
 \end_inset