diff --git a/data/templates/article.jats_publishing b/data/templates/article.jats_publishing
index f78540fab..40db76f4b 100644
--- a/data/templates/article.jats_publishing
+++ b/data/templates/article.jats_publishing
@@ -95,8 +95,14 @@ $if(author.orcid)$
 $endif$
 $if(author.surname)$
 <name>
-<surname>$author.surname$</surname>
-<given-names>$author.given-names$</given-names>
+<surname>$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$$author.surname$</surname>
+<given-names>$author.given-names$$if(author.dropping-particle)$ ${author.dropping-particle}$endif$</given-names>
+$if(author.prefix)$
+<prefix>${author.suffix}</prefix>
+$endif$
+$if(author.suffix)$
+<suffix>${author.suffix}</suffix>
+$endif$
 </name>
 $elseif(author.name)$
 <string-name>$author.name$</string-name>
diff --git a/data/templates/default.jats_articleauthoring b/data/templates/default.jats_articleauthoring
index c34f2d2f0..51c52af31 100644
--- a/data/templates/default.jats_articleauthoring
+++ b/data/templates/default.jats_articleauthoring
@@ -28,8 +28,14 @@ $if(author.orcid)$
 $endif$
 $if(author.surname)$
 <name>
-<surname>$author.surname$</surname>
-<given-names>$author.given-names$</given-names>
+<surname>$if(author.non-dropping-particle)$${author.non-dropping-particle} $endif$${author.surname}</surname>
+<given-names>${author.given-names}$if(author.dropping-particle)$ ${author.dropping-particle}$endif$</given-names>
+$if(author.prefix)$
+<prefix>${author.suffix}</prefix>
+$endif$
+$if(author.suffix)$
+<suffix>${author.suffix}</suffix>
+$endif$
 </name>
 $elseif(author.name)$
 <string-name>$author.name$</string-name>