diff --git a/bootc/scenario3a/root/usr/local/bin/bootstrap-vm.sh b/bootc/scenario3a/root/usr/local/bin/bootstrap-vm.sh
index c6446ce..422b8b2 100755
--- a/bootc/scenario3a/root/usr/local/bin/bootstrap-vm.sh
+++ b/bootc/scenario3a/root/usr/local/bin/bootstrap-vm.sh
@@ -63,7 +63,7 @@ chcon system_u:object_r:virt_image_t:s0 "$temp_dir/root.qcow2"
 if [ -f /etc/flightctl/config.yaml ]; then
   if [ -n "${FLIGHTCTL_LABELS_OVERRIDE:-}" ]; then
     echo "Overriding default labels with: ${FLIGHTCTL_LABELS_OVERRIDE}"
-    yq e ". * { \"default-labels\": ${FLIGHTCTL_LABELS_OVERRIDE} }" /etc/flightctl/config.yaml > "$temp_dir/config.yaml"
+    yq e ". * { \"default-labels\": ${FLIGHTCTL_LABELS_OVERRIDE} } | .default-labels.aap_group = ((.default-labels.site + \"_\" + .default-labels.type) | sub(\"-\", \"_\"))" /etc/flightctl/config.yaml > "$temp_dir/config.yaml"
   else
     cp /etc/flightctl/config.yaml "$temp_dir/config.yaml"
   fi
diff --git a/pxe-boot/install.sh b/pxe-boot/install.sh
index b4110ae..c1c945d 100755
--- a/pxe-boot/install.sh
+++ b/pxe-boot/install.sh
@@ -103,8 +103,8 @@ install -m 0644 -o dnsmasq -g dnsmasq /usr/share/ipxe/{undionly.kpxe,ipxe-snponl
 install -m 0644 -o dnsmasq -g dnsmasq /usr/share/ipxe/arm64-efi/snponly.efi /var/lib/tftpboot/ipxe-snponly-arm64.efi
 restorecon -RF "/var/lib/tftpboot"
 
-declare -A mac_00be43ec5619_labels=( ["site"]="paris-wagram" ["type"]="baremetal" )
-declare -A mac_00190f440391_labels=( ["site"]="villeneuve-d-ascq" ["type"]="baremetal" )
+declare -A mac_00be43ec5619_labels=( ["site"]="paris-wagram" ["type"]="baremetal" ["aap_group"]="paris_wagram_baremetal" )
+declare -A mac_00190f440391_labels=( ["site"]="villeneuve-d-ascq" ["type"]="baremetal" ["aap_group"]="villeneuve_d_ascq_baremetal" )
 declare -A mac_labels=( 
     [mac-00be43ec5619]="mac_00be43ec5619_labels"
     [mac-00190f440391]="mac_00190f440391_labels"