diff --git a/backends/common_templates/adoc/inst.adoc.erb b/backends/common_templates/adoc/inst.adoc.erb
index c4403686a7..1b3af9f9f5 100644
--- a/backends/common_templates/adoc/inst.adoc.erb
+++ b/backends/common_templates/adoc/inst.adoc.erb
@@ -19,7 +19,7 @@ Synopsis::
 
 Mnemonic::
 ----
-<%= inst.name %> <%= inst.assembly.gsub('x', 'r') %>
+<%= "#{inst.name} #{inst.assembly.gsub('x', 'r')}".strip %>
 ----
 
 Encoding::
diff --git a/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb b/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
index 227c74b671..b71fd2530a 100644
--- a/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
+++ b/backends/ext_pdf_doc/templates/ext_pdf.adoc.erb
@@ -250,7 +250,7 @@ The following <%= ext.instructions.size %> instructions are affected by this ext
 <%- inst_list.each do |i| -%>
 | <%= i.rv32? ? "&#x2713;" : "" %>
 | <%= i.rv64? ? "&#x2713;" : "" %>
-| `<%= i.name %> <%= i.assembly.gsub("x", "r").strip %>`
+| `<%= "#{i.name} #{i.assembly.gsub('x', 'r')}".strip %>`
 | xref:insns-<%= i.name.gsub('.', '_') %>[<%= i.long_name %>]
 <%- if versions.size > 1 -%>
 | <%= ext.versions.map { |v| i.defined_by_condition.possibly_satisfied_by?(v) ? "&#x2713;" : "" }.join(" | ") %>
diff --git a/backends/instructions_appendix/templates/instructions.adoc.erb b/backends/instructions_appendix/templates/instructions.adoc.erb
index c5e031c98a..98df0fb440 100755
--- a/backends/instructions_appendix/templates/instructions.adoc.erb
+++ b/backends/instructions_appendix/templates/instructions.adoc.erb
@@ -10,11 +10,9 @@
 Synopsis::
 <%= inst.long_name %>
 
-<%- if inst.assembly.to_s.strip != "" -%>
 Assembly::
-<%= inst.fix_entities("#{inst.name.downcase} #{inst.assembly}") %>
+<%= inst.fix_entities("#{inst.name.downcase} #{inst.assembly}").strip %>
 
-<%- end -%>
 Encoding::
 <%- if inst.multi_encoding? -%>
 [NOTE]
diff --git a/backends/manual/templates/instruction.adoc.erb b/backends/manual/templates/instruction.adoc.erb
index 4f7b7f504d..21ca77f9b7 100644
--- a/backends/manual/templates/instruction.adoc.erb
+++ b/backends/manual/templates/instruction.adoc.erb
@@ -14,7 +14,7 @@ This instruction must have data-independent timing when extension `Zkt` is enabl
 
 == Assembly format
 
-`<%= inst.name %> <%= inst.assembly.gsub('x', 'r') %>`
+`<%= "#{inst.name} #{inst.assembly.gsub('x', 'r')}".strip %>`
 
 == Decode Variables