diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a54a14fb2bc24e536419bdf64600fb021146bbf9..61794d88dc8f8f56cbc25c38bd8b1ac94d3906b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ artifacts:
   - ./install-font-debian.sh
   - printf "\providecommand{\\\version}{%s}" $(echo $CI_BUILD_REF | cut -c1-8) > version.tex
   - ./build.sh
+  - ./build.sh -n -c presentation-with-notes
   - mv dist/*.pdf .
   artifacts:
     paths:
diff --git a/build.sh b/build.sh
index 270fed7c660ad946394b042761891d09005b0d9d..756572f780d564ee462459dcc5f7caa1a889770b 100755
--- a/build.sh
+++ b/build.sh
@@ -8,8 +8,9 @@ OUTDIR=dist
 JOBNAME=presentation
 ITERATIONS=3
 LATEX_DEBUG=""
+LATEX_NOTES=""
 
-usage() { echo "Usage: $0 [-i <number> -g -v -t]" 1>&2; exit 1; }
+usage() { echo "Usage: $0 [-i <number> -g -v -t -n -c <string>]" 1>&2; exit 1; }
 
 log() {
 	if [ -n "${VERBOSE}" ]; then 
@@ -40,7 +41,7 @@ test() {
 	echo "Tests passed!"
 }
 
-while getopts "i:vgt" o; do
+while getopts "c:i:vgtn" o; do
 	case "${o}" in
 		g)
 			DEBUG=true
@@ -49,6 +50,12 @@ while getopts "i:vgt" o; do
 		v)
 			VERBOSE=true
 			;;
+		c)
+			JOBNAME=${OPTARG}
+			;;
+		n)
+			NOTES=true
+			;;
 		i)
 			ITERATIONS=${OPTARG}
 			;;
@@ -76,6 +83,10 @@ if [ -n "${DEBUG}" ]; then
 	LATEX_DEBUG="\def\debug{true}"
 fi
 
+if [ -n "${NOTES}" ]; then
+	LATEX_NOTES="\def\generatenotes{true}"
+fi
+
 echo "Compiling the project into ${JOBNAME}.pdf ..."
 
 for j in `seq 1 $ITERATIONS`;	
@@ -84,7 +95,7 @@ do
 		--interaction=${INTERACTION} \
 		-output-directory=${OUTDIR} \
 		-jobname=${JOBNAME} \
-		main
+		"${LATEX_NOTES}${LATEX_DEBUG}\input main.tex"
 
 	if [ "$j" == "1" ]
 	then
diff --git a/cli.tex b/cli.tex
new file mode 100644
index 0000000000000000000000000000000000000000..ac492ae12fb824f543f1c3cac144c78e9911b929
--- /dev/null
+++ b/cli.tex
@@ -0,0 +1,20 @@
+% cSpell:disable
+
+% CLI arguments
+
+\newif\ifrelease%
+
+\ifdefined\debug%
+	\releasefalse%
+\else
+	\releasetrue%
+\fi
+
+
+\newif\ifnotes%
+
+\ifdefined\generatenotes%
+	\notestrue%
+\else
+	\notesfalse%
+\fi
diff --git a/main.tex b/main.tex
index 0d16ef84e7816de9486ac8c0a24f41274060199b..99560d710bc110cd735ce989c7fa1b33b1047c9c 100644
--- a/main.tex
+++ b/main.tex
@@ -1,11 +1,12 @@
 % cSpell:ignore bibfile
 
 \documentclass{beamer}
+	
+	\input{cli}
+	\input{version}
 
-\input{version}
-
-\input{packages}
-\input{preamble}
+	\input{packages}
+	\input{preamble}
 
 \begin{document}
 
diff --git a/preamble.tex b/preamble.tex
index dc61760a6154215499e7916f7ad4677656d0754f..3df6bd40190251532c14c684bf55c15615800833 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -5,7 +5,9 @@
 	titleformat section=smallcaps
 ]{metropolis}
 
-\setbeameroption{show notes on second screen}
+\ifnotes%
+	\setbeameroption{show notes on second screen}
+\fi
 
 \title{Data-X Talk} % chktex 13