diff --git a/Makefile b/Makefile
index 4fc9c1c..1ffa484 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: login-app/login-app token-validator/token-validator
+tuto1: login-app/login-app token-validator/token-validator login-initrd.img server.iso
 
 fonts: fonts/Inconsolata-16b.psf fonts/Inconsolata-16r.psf fonts/Inconsolata-32b.psf fonts/Inconsolata-32r.psf
 fonts/Inconsolata-16b.psf:
@@ -17,6 +17,15 @@ token-validator/token-validator: token-validator/*.go
 login-app/login-app: login-app/*.go
 	GOOS=linux GOARCH=amd64 go build -tags netgo -ldflags '-w -extldflags "-static -lncurses"' -o $@ ./login-app
 
+login-initrd.img: login.yml login-app/login-app
+	linuxkit build $<
+
+challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png fonts/Inconsolata-16b.psf.gz fonts/Inconsolata-16r.psf.gz fonts/Inconsolata-32b.psf.gz fonts/Inconsolata-32r.psf.gz pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
+	linuxkit build $<
+
+server.iso: server.yml students.csv ssl/fullchain.pem ssl/privkey.pem challenge-initrd.img challenge-kernel login-initrd.img
+	linuxkit build -format iso-bios $<
+
 tuto2-kernel: tuto2.yml
 	linuxkit build $<
 tuto2-initrd.img: tuto2.yml
diff --git a/challenge.yml b/challenge.yml
index 936dc2a..8f3852f 100644
--- a/challenge.yml
+++ b/challenge.yml
@@ -1,5 +1,5 @@
 init:
-  - nemunaire/challenge:6eb16abb6c584ad6a82b9518968014d145decd38
+  - nemunaire/challenge:065780e3b931b5cf83d471571d195a3f22833d25
 
 files:
   - path: etc/motd
diff --git a/login.yml b/login.yml
index 49ac548..4413acb 100644
--- a/login.yml
+++ b/login.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.9.82
+  image: nemunaire/kernel:4.20.3-2f4904f91eeb61212204bd0ff70e6e53f38b8adb-dirty-amd64
   cmdline: "console=tty0 console=ttyS0 quiet panic=-1"
 
 init:
diff --git a/pkg/challenge/init b/pkg/challenge/init
index 520cde5..faf9664 100755
--- a/pkg/challenge/init
+++ b/pkg/challenge/init
@@ -7,8 +7,6 @@ mount -t sysfs sysfs /sys
 
 mdev -s
 
-modprobe snd-pcsp
-
 # /proc/cmdline parser (from Gentoo Wiki)
 cmdline() {
     local value