diff --git a/agenda/yocto-agenda.tex b/agenda/yocto-agenda.tex
index f7dcc92b11..e243d723d3 100644
--- a/agenda/yocto-agenda.tex
+++ b/agenda/yocto-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{onsite}
 \def \agendalanguage{english}
@@ -9,13 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
-\showboarditem{beagleboneblack}
-\showboarditem{beagleplay}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onsiteagenda
 
diff --git a/agenda/yocto-fr-agenda.tex b/agenda/yocto-fr-agenda.tex
index 119c568f88..d8017b7d62 100644
--- a/agenda/yocto-fr-agenda.tex
+++ b/agenda/yocto-fr-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{onsite}
 \def \agendalanguage{french}
@@ -9,13 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
-\showboarditem{beagleboneblack}
-\showboarditem{beagleplay}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onsiteagenda
 
diff --git a/agenda/yocto-online-agenda.tex b/agenda/yocto-online-agenda.tex
index 1f435bbf85..aa09c64ced 100644
--- a/agenda/yocto-online-agenda.tex
+++ b/agenda/yocto-online-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{online}
 \def \agendalanguage{english}
@@ -9,13 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
-\showboarditem{beagleboneblack}
-\showboarditem{beagleplay}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onlineagenda
 
diff --git a/agenda/yocto-online-fr-agenda.tex b/agenda/yocto-online-fr-agenda.tex
index cd121bb279..18f7a0689c 100644
--- a/agenda/yocto-online-fr-agenda.tex
+++ b/agenda/yocto-online-fr-agenda.tex
@@ -1,4 +1,4 @@
-\documentclass[a4paper,12pt,obeyspaces,spaces,hyphens]{article}
+\documentclass[a4paper]{article}
 
 \def \trainingtype{online}
 \def \agendalanguage{french}
@@ -9,13 +9,9 @@
 
 \begin{document}
 
-\feshowtitle
-
-\feshowinfo
-
-\showboarditem{stm32mp1}
-\showboarditem{beagleboneblack}
-\showboarditem{beagleplay}
+\feshowsidebar
+\feshowfirstpage
+\feshowboards
 
 \onlineagenda
 
diff --git a/agenda/yocto.inc.tex b/agenda/yocto.inc.tex
index d2053fe1da..70e70611ea 100644
--- a/agenda/yocto.inc.tex
+++ b/agenda/yocto.inc.tex
@@ -18,6 +18,8 @@
   \def \trainingduration{3}
 }
 
+\def \trainingicon{common/flaticon-yocto-training.png}
+
 % Training objectives
 \ifthenelse{\equal{\agendalanguage}{french}}{
   \def \traininggoals{
@@ -61,6 +63,19 @@
   }
 }
 
+\def \feshowboards{
+    \ifthenelse{\equal{\agendalanguage}{french}}{
+      \section{Plateformes matérielle pour les travaux pratiques}
+    }{
+      \section{Hardware platform for practical labs}
+    }
+
+  \showboarditem{stm32mp1}
+  \showboarditem{beagleboneblack}
+  \showboarditem{beagleplay}
+  \newpage
+}
+
 % Training prerequisites
 \def \trainingprerequisites{
   \begin{itemize}
@@ -647,6 +662,12 @@
 }
 
 \def \onlineagenda {
+  \ifthenelse{\equal{\agendalanguage}{french}}{
+    \section{Programme de la formation}
+  }{
+    \section{Training Schedule}
+  }
+  \begin{tabularx}{\textwidth}{p{2cm}p{5cm}p{11cm}}
   \showagendaday{1}
   \showagendaitem{intro}{lecture}
   \showagendaitem{overview}{lecture}
@@ -678,31 +699,38 @@
   \showagendaitem{automatinglayermanagement}{lecture}
   \showagendaitem{runtimepackagemanagement}{lecture}
   \showagendaitem{qna}{misc}
+  \end{tabularx}
 }
 
 \def \onsiteagenda {
-  \showonsiteagendaday{1}{morning}
+  \ifthenelse{\equal{\agendalanguage}{french}}{
+    \section{Programme de la formation}
+  }{
+    \section{Training Schedule}
+  }
+  \begin{tabularx}{\textwidth}{p{2cm}p{5cm}p{11cm}}
+  \showagendaday{1}
   \showagendaitem{intro}{lecture}
   \showagendaitem{overview}{lecture}
   \showagendaitem{usingbasics}{lecture}
   \showagendaitem{firstbuild}{lab}
-  \showonsiteagendaday{1}{afternoon}
+  \showagendaday{2}
   \showagendaitem{flashingbooting}{lab}
   \showagendaitem{usingadvanced}{lecture}
   \showagendaitem{nfsconfiguring}{lab}
-  \showonsiteagendaday{2}{morning}
+  \showagendaday{3}
   \showagendaitem{writingrecipesbasics}{lecture}
   \showagendaitem{appcompilation}{lab}
   \showagendaitem{writingrecipesadvanced}{lecture}
-  \showonsiteagendaday{2}{afternoon}
+  \showagendaday{4}
   \showagendaitem{layers}{lecture}
   \showagendaitem{writinglayer}{lab}
-  \showonsiteagendaday{3}{morning}
+  \showagendaday{5}
   \showagendaitem{extendrecipe}{lab}
   \showagendaitem{writingbsp}{lecture}
   \showagendaitem{kernelchanges}{lab}
   \showagendaitem{distrolayer}{lecture}
-  \showonsiteagendaday{3}{afternoon}
+  \showagendaday{6}
   \showagendaitem{image}{lecture}
   \showagendaitem{image}{lab}
   \showagendaitem{writingrecipesgoingfurther}{lecture}
@@ -713,4 +741,5 @@
   \showagendaitem{devtool}{lab}
   \showagendaitem{automatinglayermanagement}{lecture}
   \showagendaitem{runtimepackagemanagement}{lecture}
+  \end{tabularx}
 }
diff --git a/common/flaticon-yocto-training.png b/common/flaticon-yocto-training.png
new file mode 100644
index 0000000000..973cdb0eb5
Binary files /dev/null and b/common/flaticon-yocto-training.png differ