diff --git a/flightctl/fleets.yaml b/flightctl/fleets.yaml
index 56f00de..3d2ea78 100644
--- a/flightctl/fleets.yaml
+++ b/flightctl/fleets.yaml
@@ -22,6 +22,34 @@ spec:
- name: scenario1-config
configType: GitConfigProviderSpec
gitRef:
- path: /flightctl/overlays/{{ getOrDefault .metadata.labels "overlay" "default" }}/scenario1
+ path: /flightctl/scenario1
+ repository: demo-edge-retail
+ targetRevision: main
+---
+apiVersion: flightctl.io/v1alpha1
+kind: Fleet
+metadata:
+ annotations: {}
+ labels:
+ scenario: '1'
+ name: scenario1
+spec:
+ selector:
+ matchLabels:
+ scenario: '1'
+ template:
+ metadata:
+ labels:
+ fleet: scenario1
+ spec:
+ applications: []
+ config: []
+ os:
+ image: edge-registry.itix.fr/demo-edge-retail/scenario1:latest
+ config:
+ - name: scenario1-config
+ configType: GitConfigProviderSpec
+ gitRef:
+ path: /flightctl/scenario4/sites/{{ getOrDefault .metadata.labels "site" "default" }}/
repository: demo-edge-retail
targetRevision: main
diff --git a/flightctl/overlays/default/scenario2/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario2/etc/motd.d/unconfigured
deleted file mode 100644
index af8dfa1..0000000
--- a/flightctl/overlays/default/scenario2/etc/motd.d/unconfigured
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-HEADS UP !!!
-
-This system is not configured !
-
diff --git a/flightctl/overlays/default/scenario3/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario3/etc/motd.d/unconfigured
deleted file mode 100644
index af8dfa1..0000000
--- a/flightctl/overlays/default/scenario3/etc/motd.d/unconfigured
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-HEADS UP !!!
-
-This system is not configured !
-
diff --git a/flightctl/overlays/default/scenario4/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario4/etc/motd.d/unconfigured
deleted file mode 100644
index af8dfa1..0000000
--- a/flightctl/overlays/default/scenario4/etc/motd.d/unconfigured
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-HEADS UP !!!
-
-This system is not configured !
-
diff --git a/flightctl/overlays/default/scenario5/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario5/etc/motd.d/unconfigured
deleted file mode 100644
index af8dfa1..0000000
--- a/flightctl/overlays/default/scenario5/etc/motd.d/unconfigured
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-HEADS UP !!!
-
-This system is not configured !
-
diff --git a/flightctl/overlays/default/scenario6/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario6/etc/motd.d/unconfigured
deleted file mode 100644
index af8dfa1..0000000
--- a/flightctl/overlays/default/scenario6/etc/motd.d/unconfigured
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-HEADS UP !!!
-
-This system is not configured !
-
diff --git a/flightctl/overlays/optiplex-7000/scenario1/etc/containers/systemd/configs/nextcloud-config.env b/flightctl/scenario1/etc/containers/systemd/configs/nextcloud-config.env
similarity index 100%
rename from flightctl/overlays/optiplex-7000/scenario1/etc/containers/systemd/configs/nextcloud-config.env
rename to flightctl/scenario1/etc/containers/systemd/configs/nextcloud-config.env
diff --git a/flightctl/overlays/default/scenario1/etc/motd.d/unconfigured b/flightctl/scenario4/sites/default/etc/motd.d/unconfigured
similarity index 100%
rename from flightctl/overlays/default/scenario1/etc/motd.d/unconfigured
rename to flightctl/scenario4/sites/default/etc/motd.d/unconfigured
diff --git a/flightctl/scenario4/sites/paris-wagram/etc/containers/systemd/villeneuve-d-ascq/odoo-config.env b/flightctl/scenario4/sites/paris-wagram/etc/containers/systemd/villeneuve-d-ascq/odoo-config.env
new file mode 100644
index 0000000..cb16c10
--- /dev/null
+++ b/flightctl/scenario4/sites/paris-wagram/etc/containers/systemd/villeneuve-d-ascq/odoo-config.env
@@ -0,0 +1,4 @@
+DATABASE=itix
+ADMIN_PASSWORD=S3cr3t!
+RIBBON_COLOR=rgba(255,0,0,.6)
+RIBBON_NAME=Paris Wagram
({db_name})
diff --git a/flightctl/overlays/optiplex-7000/scenario4/etc/containers/systemd/configs/odoo-config.env b/flightctl/scenario4/sites/villeneuve-d-ascq/etc/containers/systemd/villeneuve-d-ascq/odoo-config.env
similarity index 59%
rename from flightctl/overlays/optiplex-7000/scenario4/etc/containers/systemd/configs/odoo-config.env
rename to flightctl/scenario4/sites/villeneuve-d-ascq/etc/containers/systemd/villeneuve-d-ascq/odoo-config.env
index a18c929..e4e5a36 100644
--- a/flightctl/overlays/optiplex-7000/scenario4/etc/containers/systemd/configs/odoo-config.env
+++ b/flightctl/scenario4/sites/villeneuve-d-ascq/etc/containers/systemd/villeneuve-d-ascq/odoo-config.env
@@ -1,4 +1,4 @@
DATABASE=itix
ADMIN_PASSWORD=S3cr3t!
RIBBON_COLOR=rgba(0,0,255,.6)
-RIBBON_NAME=SITE1
({db_name})
+RIBBON_NAME=Villeneuve d'Ascq
({db_name})
diff --git a/pxe-boot/README.md b/pxe-boot/README.md
index e69de29..263c9fd 100644
--- a/pxe-boot/README.md
+++ b/pxe-boot/README.md
@@ -0,0 +1,67 @@
+# PXE Boot configuration
+
+## DHCP configuration
+
+```ini
+##
+## Boot PXE for Edge devices
+##
+
+# Architecture identifier comes from https://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xhtml#processor-architecture
+dhcp-match=set:bios,option:client-arch,0
+dhcp-match=set:efix32,option:client-arch,6
+dhcp-match=set:efix64,option:client-arch,7
+dhcp-match=set:efix64,option:client-arch,9
+dhcp-match=set:efiarm64,option:client-arch,11
+dhcp-match=set:ipxe,option:user-class,iPXE
+
+# See https://ipxe.org/howto/chainloading
+dhcp-boot=tag:pxe,tag:bios,tag:!ipxe,undionly.kpxe,,192.168.2.41
+dhcp-boot=tag:pxe,tag:efix64,tag:!ipxe,ipxe-snponly-x86_64.efi,,192.168.2.41
+dhcp-boot=tag:pxe,tag:efiarm64,tag:!ipxe,ipxe-snponly-arm64.efi,,192.168.2.41
+dhcp-boot=tag:pxe,tag:ipxe,boot.ipxe,,192.168.2.41
+
+##
+## Dell Optiplex 7000 Micro
+##
+dhcp-host=set:vlan2,set:pxe,00:be:43:ec:56:19,192.168.2.73,[::49],24h
+host-record=optiplex-7000.itix.fr,192.168.2.73,[::49],24h
+
+##
+## Adlink DLAP 4001 SMD
+##
+dhcp-host=set:vlan2,set:pxe,00:19:0f:44:03:91,192.168.2.75,[::4b],24h
+host-record=adlink-dlap-4001.itix.fr,192.168.2.75,[::4b],24h
+```
+
+## DVD content in `/var/www/repo`
+
+```sh
+sudo mount ~/Downloads/rhel-9.6-x86_64-dvd.iso /mnt -o loop,ro
+rsync -av /mnt/ nicolas@edge-infra.itix.fr:/var/www/repo/rhel9/x86_64/
+sudo umount /mnt
+sudo mount ~/Downloads/rhel-9.6-aarch64-dvd.iso /mnt -o loop,ro
+rsync -av /mnt/ nicolas@edge-infra.itix.fr:/var/www/repo/rhel9/arm64/
+sudo umount /mnt
+sudo mount ~/Downloads/rhel-10.0-x86_64-dvd.iso /mnt -o loop,ro
+rsync -av /mnt/ nicolas@edge-infra.itix.fr:/var/www/repo/rhel10/x86_64/
+sudo umount /mnt
+sudo mount ~/Downloads/rhel-10.0-aarch64-dvd.iso /mnt -o loop,ro
+rsync -av /mnt/ nicolas@edge-infra.itix.fr:/var/www/repo/rhel10/arm64/
+sudo umount /mnt
+```
+
+## Flightctl configuration file
+
+```sh
+flightctl certificate request --signer=enrollment --expiration=365d --output=embedded > config.yaml
+```
+
+## Registry token
+
+```sh
+export REGISTRY_AUTH_FILE="$PROJECT_DIR/auth.json"
+podman login registry.redhat.io
+podman login my.registry.example
+```
+