diff --git a/Makefile b/Makefile
index 415f463..f300294 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,59 @@
-tuto1: login-app/login-app token-validator/token-validator login-initrd.img server.iso
+tuto1: token-validator/token-validator server.iso
+
+login-app: pkg/login-app/build.yml pkg/login-app/Dockerfile pkg/login-app/cmd/login.go pkg/login-app/cmd/main.go pkg/login-app/cmd/windows.go
+	linuxkit pkg build -org nemunaire pkg/login-app/
+	#linuxkit pkg push -org nemunaire --sign=false pkg/login-app/
+
+login-initrd.img: login.yml login-app
+	linuxkit build -docker $<
 
 token-validator/token-validator: token-validator/*.go
 	go generate ./token-validator
 	GOOS=linux GOARM=5 GOARCH=arm go build -tags netgo -ldflags '-w -extldflags "-static"' -o $@ ./token-validator
 
-challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
-	linuxkit build $<
+challenge: pkg/challenge/adlin pkg/challenge/issue pkg/challenge/init
+	linuxkit pkg build -org nemunaire pkg/challenge/
 
-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 $<
+challenge-initrd.img: challenge.yml subject/adlin.6.gz subject/adlin-TP1-topologie.png
+	linuxkit build -docker $<
+
+
+pkg/login-validator: pkg/login-validator/cmd/login.go pkg/login-validator/cmd/main.go pkg/login-validator/cmd/pxetpl.go pkg/login-validator/cmd/logout.go pkg/login-validator/cmd/auth.go pkg/login-validator/cmd/arp.go pkg/login-validator/cmd/auth_krb5.go pkg/login-validator/cmd/auth_ldap.go pkg/login-validator/cmd/students.go pkg/login-validator/cmd/auth_fwd.go pkg/login-validator/cmd/ssh.go pkg/login-validator/build.yml pkg/login-validator/Dockerfile
+	linuxkit pkg build -org nemunaire pkg/login-validator/
+	touch pkg/login-validator
+
+pkg/monit: pkg/monit/build.yml pkg/monit/Dockerfile
+	linuxkit pkg build -org nemunaire pkg/monit/
+	touch pkg/monit
+
+pkg/postfix: pkg/postfix/build.yml pkg/postfix/docker-entrypoint.sh pkg/postfix/Dockerfile
+	linuxkit pkg build -org nemunaire pkg/postfix/
+	touch pkg/postfix
+
+pkg/tftpd: pkg/tftpd/build.yml pkg/tftpd/Dockerfile
+	linuxkit pkg build -org nemunaire pkg/tftpd/
+	touch pkg/tftpd
+
+pkg/unbound: pkg/unbound/build.yml pkg/unbound/docker-entrypoint.sh pkg/unbound/Dockerfile
+	linuxkit pkg build -org nemunaire pkg/unbound/
+	touch pkg/unbound
+
+pkg/wg-manager: pkg/wg-manager/cmd/register.go pkg/wg-manager/cmd/main.go pkg/wg-manager/build.yml pkg/wg-manager/Dockerfile
+	linuxkit pkg build -org nemunaire pkg/wg-manager/
+	touch pkg/wg-manager
+
+server.iso: server.yml students.csv ssl/fullchain.pem ssl/privkey.pem challenge-initrd.img pkg/login-validator pkg/monit pkg/postfix pkg/tftpd pkg/unbound pkg/wg-manager challenge-kernel login-initrd.img
+	linuxkit build -docker -format iso-bios $<
 
 tuto2-kernel: tuto2.yml
-	linuxkit build $<
+	linuxkit build -docker $<
 tuto2-initrd.img: tuto2.yml
-	linuxkit build $<
+	linuxkit build -docker $<
 tuto2-cmdline: tuto2.yml
-	linuxkit build $<
+	linuxkit build -docker $<
 
 tuto2.iso: tuto2.yml tuto2-kernel tuto2-initrd.img tuto2-cmdline
-	linuxkit build -format iso-bios $<
+	linuxkit build -docker -format iso-bios $<
 
 tuto2-srs.iso: tuto2.iso pkg/debian-tuto2/isolinux.cfg
 	$(eval TDIR := $(shell mktemp -d))
@@ -35,14 +70,14 @@ tuto2-srs.iso.gz: tuto2-srs.iso
 	gzip -9 < $< > $@
 
 tuto3-kernel: tuto3.yml
-	linuxkit build $<
+	linuxkit build -docker $<
 tuto3-initrd.img: tuto3.yml
-	linuxkit build $<
+	linuxkit build -docker $<
 tuto3-cmdline: tuto3.yml
-	linuxkit build $<
+	linuxkit build -docker $<
 
 tuto3.iso: tuto3.yml
-	linuxkit build -format iso-bios $<
+	linuxkit build -docker -format iso-bios $<
 
 tuto3.iso.gz: tuto3.iso
 	gzip -9 < $< > $@