diff --git a/flightctl/fleets.yaml b/flightctl/fleets.yaml
index 24395b4..56f00de 100644
--- a/flightctl/fleets.yaml
+++ b/flightctl/fleets.yaml
@@ -1,7 +1,7 @@
 apiVersion: flightctl.io/v1alpha1
 kind: Fleet
 metadata:
-  annotations:
+  annotations: {}
   labels:
     scenario: '1'
   name: scenario1
@@ -22,7 +22,6 @@ spec:
       - name: scenario1-config
         configType: GitConfigProviderSpec
         gitRef:
-          path: /flightctl/overlays/{{ getOrDefault .status.systemInfo "hostname" "default" }}/scenario1
+          path: /flightctl/overlays/{{ getOrDefault .metadata.labels "overlay" "default" }}/scenario1
           repository: demo-edge-retail
           targetRevision: main
-
diff --git a/flightctl/overlays/default/scenario1/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario1/etc/motd.d/unconfigured
new file mode 100644
index 0000000..af8dfa1
--- /dev/null
+++ b/flightctl/overlays/default/scenario1/etc/motd.d/unconfigured
@@ -0,0 +1,6 @@
+
+
+HEADS UP !!!
+
+This system is not configured !
+
diff --git a/flightctl/overlays/default/scenario2/etc/motd.d/unconfigured b/flightctl/overlays/default/scenario2/etc/motd.d/unconfigured
new file mode 100644
index 0000000..af8dfa1
--- /dev/null
+++ b/flightctl/overlays/default/scenario2/etc/motd.d/unconfigured
@@ -0,0 +1,6 @@
+
+
+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
new file mode 100644
index 0000000..af8dfa1
--- /dev/null
+++ b/flightctl/overlays/default/scenario3/etc/motd.d/unconfigured
@@ -0,0 +1,6 @@
+
+
+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
new file mode 100644
index 0000000..af8dfa1
--- /dev/null
+++ b/flightctl/overlays/default/scenario4/etc/motd.d/unconfigured
@@ -0,0 +1,6 @@
+
+
+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
new file mode 100644
index 0000000..af8dfa1
--- /dev/null
+++ b/flightctl/overlays/default/scenario5/etc/motd.d/unconfigured
@@ -0,0 +1,6 @@
+
+
+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
new file mode 100644
index 0000000..af8dfa1
--- /dev/null
+++ b/flightctl/overlays/default/scenario6/etc/motd.d/unconfigured
@@ -0,0 +1,6 @@
+
+
+HEADS UP !!!
+
+This system is not configured !
+
diff --git a/flightctl/overlays/optiplex-7000/scenario1/etc/containers/systemd/configs/nextcloud-config.env b/flightctl/overlays/optiplex-7000/scenario1/etc/containers/systemd/configs/nextcloud-config.env
new file mode 100644
index 0000000..32c81ad
--- /dev/null
+++ b/flightctl/overlays/optiplex-7000/scenario1/etc/containers/systemd/configs/nextcloud-config.env
@@ -0,0 +1,16 @@
+##
+## Nextcloud Configuration Environment Variables
+##
+
+# Nextcloud domain configuration
+NEXTCLOUD_TRUSTED_DOMAINS=optiplex-7000.itix.fr
+OVERWRITEHOST=optiplex-7000.itix.fr
+OVERWRITEPROTOCOL=http
+OVERWRITECLIURL=http://optiplex-7000.itix.fr
+
+# Nextcloud admin credentials
+NEXTCLOUD_ADMIN_USER=admin
+NEXTCLOUD_ADMIN_PASSWORD=nextcloud
+
+# Nextcloud server info token
+NEXTCLOUD_SERVERINFO_TOKEN=S3cr3t!
diff --git a/flightctl/overlays/optiplex-7000/scenario4/etc/containers/systemd/configs/odoo-config.env b/flightctl/overlays/optiplex-7000/scenario4/etc/containers/systemd/configs/odoo-config.env
new file mode 100644
index 0000000..a18c929
--- /dev/null
+++ b/flightctl/overlays/optiplex-7000/scenario4/etc/containers/systemd/configs/odoo-config.env
@@ -0,0 +1,4 @@
+DATABASE=itix
+ADMIN_PASSWORD=S3cr3t!
+RIBBON_COLOR=rgba(0,0,255,.6)
+RIBBON_NAME=SITE1<br/>({db_name})