From 0d5bd58fdcf1de92c370db2f217b3b0affc78ea9 Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Sat, 19 Aug 2017 13:52:03 +0100
Subject: [PATCH] scenarios: updating base box selectors to include
 type="server" (along side platform="linux") in preparation for kali basebox
 merge

---
 scenarios/ctf/basic_narrative.xml                           | 2 +-
 scenarios/ctf/flawed_fortress_1.xml                         | 6 +++---
 scenarios/ctf/nw_cyber_games.xml                            | 2 +-
 scenarios/default_scenario.xml                              | 2 +-
 .../datastore_examples/datastores_rather_than_nesting.xml   | 2 +-
 scenarios/examples/datastore_examples/example.xml           | 2 +-
 .../datastore_examples/iteration_and_element_access.xml     | 2 +-
 .../examples/datastore_examples/precalculate_strings.xml    | 2 +-
 scenarios/examples/datastore_examples/store_flags.xml       | 2 +-
 .../datastore_examples/website_with_datastore_scenario.xml  | 2 +-
 .../encode_and_leak_multiple_values.xml                     | 2 +-
 .../parameterised_examples/encoder_examples/1337.xml        | 2 +-
 .../parameterised_examples/encoder_examples/base64.xml      | 2 +-
 .../encoder_examples/binary_encoder.xml                     | 2 +-
 .../encoder_examples/caesar_shift.xml                       | 2 +-
 .../parameterised_examples/encoder_examples/dec_encoder.xml | 2 +-
 .../parameterised_examples/encoder_examples/hex_encoder.xml | 2 +-
 .../parameterised_examples/encoder_examples/morse_code.xml  | 2 +-
 .../parameterised_examples/encoder_examples/oct_encoder.xml | 2 +-
 .../encoder_examples/random_selection.xml                   | 2 +-
 .../encoder_examples/random_shift_cipher.xml                | 2 +-
 .../parameterised_examples/encoder_examples/rot13.xml       | 2 +-
 .../encoder_examples/vignere_cipher.xml                     | 2 +-
 .../generate_and_leak_multiple_values.xml                   | 2 +-
 .../generate_encode_and_leak_multiple_values.xml            | 2 +-
 .../generator_examples/encoded_diff.xml                     | 2 +-
 .../generator_examples/exif_metadata.xml                    | 2 +-
 .../generator_examples/hello_world.xml                      | 2 +-
 .../generator_examples/hidden_data_in_image_file.xml        | 2 +-
 .../generator_examples/qr_code_generator.xml                | 2 +-
 .../generator_examples/random_base64.xml                    | 2 +-
 .../generator_examples/random_filename.xml                  | 2 +-
 .../generator_examples/random_flag.xml                      | 2 +-
 .../generator_examples/random_hex.xml                       | 2 +-
 .../generator_examples/random_word.xml                      | 2 +-
 .../generator_examples/security_audit_remit.xml             | 2 +-
 .../generator_examples/xor_binary_strings.xml               | 2 +-
 .../parameterised_examples/leak_multiple_values.xml         | 2 +-
 .../parameterised_examples/leeds_beckett_online_store.xml   | 2 +-
 .../examples/parameterised_examples/website_scenario.xml    | 2 +-
 scenarios/examples/public_network.xml                       | 2 +-
 scenarios/examples/random_vuln_with_cleanup.xml             | 2 +-
 .../2_apache_servers_one_with_mysql.xml                     | 4 ++--
 .../examples/services_utilities_examples/apache_service.xml | 2 +-
 .../clean_system_with_update_unix.xml                       | 2 +-
 .../firewall_configuration_example.xml                      | 2 +-
 .../examples/services_utilities_examples/irc_service.xml    | 2 +-
 .../examples/services_utilities_examples/java_service.xml   | 2 +-
 .../examples/services_utilities_examples/lamp_service.xml   | 2 +-
 .../examples/services_utilities_examples/nginx_service.xml  | 2 +-
 .../examples/services_utilities_examples/ntp_service.xml    | 2 +-
 .../services_utilities_examples/proftpd_service.xml         | 2 +-
 .../examples/services_utilities_examples/samba_service.xml  | 2 +-
 .../services_utilities_examples/smbclient_utility.xml       | 2 +-
 .../services_utilities_examples/user_test_scenario.xml      | 2 +-
 .../examples/services_utilities_examples/vsftpd_service.xml | 2 +-
 .../examples/services_utilities_examples/xfce_desktop.xml   | 2 +-
 scenarios/examples/static_IP_address.xml                    | 4 ++--
 .../readable_shadow.xml                                     | 2 +-
 .../suid_root_nano.xml                                      | 2 +-
 .../uid_bash_root.xml                                       | 2 +-
 .../uid_less_root.xml                                       | 2 +-
 .../uid_vi_root.xml                                         | 2 +-
 .../writable_groups.xml                                     | 2 +-
 .../writable_passwd.xml                                     | 2 +-
 .../writable_shadow.xml                                     | 2 +-
 .../access_control_misconfigurations_uid_vi_root.xml        | 2 +-
 .../vulnerability_examples/chkrootkit_local_escalation.xml  | 2 +-
 .../ctf_module_examples/dc16_amadhj.xml                     | 2 +-
 .../ctf_module_examples/hidden_file.xml                     | 2 +-
 .../vulnerability_examples/ctf_module_examples/symlinks.xml | 2 +-
 .../ctf_module_examples/two_shell_calls.xml                 | 2 +-
 .../vulnerability_examples/distcc_vulnerability.xml         | 2 +-
 .../vulnerability_examples/gitlist_webapp_vulnerability.xml | 2 +-
 .../vulnerability_examples/moinmoin_195_vulnerabilitiy.xml  | 2 +-
 .../vulnerability_examples/nfs_overshare_vulnerability.xml  | 2 +-
 scenarios/examples/vulnerability_examples/online_store.xml  | 2 +-
 .../proftpd_133c_backdoor_vulnerability.xml                 | 2 +-
 .../samba_symlink_traversal_vulnerability.xml               | 2 +-
 .../setuid_nmap_escalation_vulnerability.xml                | 2 +-
 .../shellshock_apache_vulnerability.xml                     | 2 +-
 .../vulnerability_examples/shellshock_vulnerability.xml     | 2 +-
 .../examples/vulnerability_examples/ssh_leaked_keys.xml     | 2 +-
 .../examples/vulnerability_examples/ssh_root_login.xml      | 2 +-
 .../vulnerability_examples/vsftpd_vulnerability.xml         | 2 +-
 .../vulnerability_examples/xfce_lightdm_root_login.xml      | 2 +-
 scenarios/security_audit/team_project_scenario.xml          | 2 +-
 87 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/scenarios/ctf/basic_narrative.xml b/scenarios/ctf/basic_narrative.xml
index f83d009e9..531ddb6c5 100644
--- a/scenarios/ctf/basic_narrative.xml
+++ b/scenarios/ctf/basic_narrative.xml
@@ -8,7 +8,7 @@
 
   <system>
     <system_name>system</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <input into_datastore="accounts">
       <!-- [0]: Entry account -->
diff --git a/scenarios/ctf/flawed_fortress_1.xml b/scenarios/ctf/flawed_fortress_1.xml
index 4d4245eb0..a6572aa68 100644
--- a/scenarios/ctf/flawed_fortress_1.xml
+++ b/scenarios/ctf/flawed_fortress_1.xml
@@ -7,7 +7,7 @@
 	<!--some basic decoding challenges-->
 	<system>
 		<system_name>decode_me</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- comment describes using pseudo code (C#-like methods with named optional arguments) -->
 		<!-- vulnerability_nfs_share_leak(strings_to_leak: encoder_flag_generator() CONCAT encoder_ascii_reversible(strings_to_encode: encoder_flag_generator()) CONCAT ...) -->
@@ -68,7 +68,7 @@
 	<!--a few vulnerabilities that are in the wild, with some flags that need decoding, some red herring services to keep things interesting-->
 	<system>
 		<system_name>in_the_wild</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability read_fact="strings_to_leak" access="remote" privilege="user_rwx">
 			<input into="strings_to_leak">
@@ -133,7 +133,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>that_escalated_quickly</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability read_fact="images_to_leak" access="remote" privilege="user_rwx">
 			<input into="images_to_leak" >
diff --git a/scenarios/ctf/nw_cyber_games.xml b/scenarios/ctf/nw_cyber_games.xml
index 4aacada78..d2ee5f240 100644
--- a/scenarios/ctf/nw_cyber_games.xml
+++ b/scenarios/ctf/nw_cyber_games.xml
@@ -7,7 +7,7 @@
 	<!--some basic decoding challenges-->
 	<system>
 		<system_name>nw_cyber_games</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- comment describes using pseudo code (C#-like methods with named optional arguments) -->
 		<!-- vulnerability_nfs_share_leak(strings_to_leak: encoder_flag_generator() CONCAT encoder_ascii_reversible(strings_to_encode: encoder_flag_generator()) CONCAT ...) -->
diff --git a/scenarios/default_scenario.xml b/scenarios/default_scenario.xml
index 5f8f5498b..a75179da7 100644
--- a/scenarios/default_scenario.xml
+++ b/scenarios/default_scenario.xml
@@ -7,7 +7,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>storage_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability privilege="user_rwx" access="remote" />
 		<vulnerability privilege="root_rwx" access="local" />
diff --git a/scenarios/examples/datastore_examples/datastores_rather_than_nesting.xml b/scenarios/examples/datastore_examples/datastores_rather_than_nesting.xml
index 2d10f172d..19f5b629a 100644
--- a/scenarios/examples/datastore_examples/datastores_rather_than_nesting.xml
+++ b/scenarios/examples/datastore_examples/datastores_rather_than_nesting.xml
@@ -8,7 +8,7 @@
 	<!--comments describe using pseudo code-->
 	<system>
 		<system_name>decode_me</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--  flag1 = encoder_flag_generator()   -->
 		<input into_datastore="flag1">
diff --git a/scenarios/examples/datastore_examples/example.xml b/scenarios/examples/datastore_examples/example.xml
index 154821121..022002a50 100644
--- a/scenarios/examples/datastore_examples/example.xml
+++ b/scenarios/examples/datastore_examples/example.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<input into_datastore="business_name">
 			<value>BusinessName1</value>
diff --git a/scenarios/examples/datastore_examples/iteration_and_element_access.xml b/scenarios/examples/datastore_examples/iteration_and_element_access.xml
index d9535d0e4..fb98f3667 100644
--- a/scenarios/examples/datastore_examples/iteration_and_element_access.xml
+++ b/scenarios/examples/datastore_examples/iteration_and_element_access.xml
@@ -8,7 +8,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--pre-calculate all flags at once, and store in flags datastore-->
 		<input into_datastore="flags">
diff --git a/scenarios/examples/datastore_examples/precalculate_strings.xml b/scenarios/examples/datastore_examples/precalculate_strings.xml
index 88e20661a..34e8a3e4d 100644
--- a/scenarios/examples/datastore_examples/precalculate_strings.xml
+++ b/scenarios/examples/datastore_examples/precalculate_strings.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<input into_datastore="business_name">
 			<value>BusinessName1</value>
diff --git a/scenarios/examples/datastore_examples/store_flags.xml b/scenarios/examples/datastore_examples/store_flags.xml
index d6222c91d..4b1bc86bd 100644
--- a/scenarios/examples/datastore_examples/store_flags.xml
+++ b/scenarios/examples/datastore_examples/store_flags.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml b/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
index 6a1b0fb02..9f160f7ce 100644
--- a/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
+++ b/scenarios/examples/datastore_examples/website_with_datastore_scenario.xml
@@ -7,7 +7,7 @@
   <!-- an example system hosting a parameterised randomly generated website -->
   <system>
     <system_name>web_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
 
     <!-- FEED GENERATED 'BUSINESS' DATA ABOVE INTO VULNERABILITY MODULES. -->
diff --git a/scenarios/examples/parameterised_examples/encode_and_leak_multiple_values.xml b/scenarios/examples/parameterised_examples/encode_and_leak_multiple_values.xml
index c977e983e..e728039f3 100644
--- a/scenarios/examples/parameterised_examples/encode_and_leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/encode_and_leak_multiple_values.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- encode and leak multiple values -->
 
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/1337.xml b/scenarios/examples/parameterised_examples/encoder_examples/1337.xml
index e99e42b18..f2af37e7b 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/1337.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/1337.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/base64.xml b/scenarios/examples/parameterised_examples/encoder_examples/base64.xml
index 81b4b56d5..fa534522f 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/base64.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/base64.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/binary_encoder.xml b/scenarios/examples/parameterised_examples/encoder_examples/binary_encoder.xml
index 8ef800370..5987bc4ca 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/binary_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/binary_encoder.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/caesar_shift.xml b/scenarios/examples/parameterised_examples/encoder_examples/caesar_shift.xml
index c51326b03..2ab254969 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/caesar_shift.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/caesar_shift.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/dec_encoder.xml b/scenarios/examples/parameterised_examples/encoder_examples/dec_encoder.xml
index ec034bd2d..af905f2c7 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/dec_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/dec_encoder.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/hex_encoder.xml b/scenarios/examples/parameterised_examples/encoder_examples/hex_encoder.xml
index e5132dacc..4202ad423 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/hex_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/hex_encoder.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/morse_code.xml b/scenarios/examples/parameterised_examples/encoder_examples/morse_code.xml
index 970bc8d07..5e83e43c3 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/morse_code.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/morse_code.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/oct_encoder.xml b/scenarios/examples/parameterised_examples/encoder_examples/oct_encoder.xml
index ded84d1df..93a46f595 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/oct_encoder.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/oct_encoder.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/random_selection.xml b/scenarios/examples/parameterised_examples/encoder_examples/random_selection.xml
index a8b3e75e2..a51bdc8e0 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/random_selection.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/random_selection.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- generate encode and leak multiple values -->
 
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/random_shift_cipher.xml b/scenarios/examples/parameterised_examples/encoder_examples/random_shift_cipher.xml
index bbe46dba3..7c5544424 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/random_shift_cipher.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/random_shift_cipher.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/rot13.xml b/scenarios/examples/parameterised_examples/encoder_examples/rot13.xml
index 51a0cc41f..38589c41f 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/rot13.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/rot13.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/encoder_examples/vignere_cipher.xml b/scenarios/examples/parameterised_examples/encoder_examples/vignere_cipher.xml
index c3350a166..5f28da48f 100644
--- a/scenarios/examples/parameterised_examples/encoder_examples/vignere_cipher.xml
+++ b/scenarios/examples/parameterised_examples/encoder_examples/vignere_cipher.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generate_and_leak_multiple_values.xml b/scenarios/examples/parameterised_examples/generate_and_leak_multiple_values.xml
index 712527fc6..638abc41d 100644
--- a/scenarios/examples/parameterised_examples/generate_and_leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/generate_and_leak_multiple_values.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- generate and leak multiple values -->
 
diff --git a/scenarios/examples/parameterised_examples/generate_encode_and_leak_multiple_values.xml b/scenarios/examples/parameterised_examples/generate_encode_and_leak_multiple_values.xml
index 3c383eef8..edc643097 100644
--- a/scenarios/examples/parameterised_examples/generate_encode_and_leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/generate_encode_and_leak_multiple_values.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- generate encode and leak multiple values -->
 
diff --git a/scenarios/examples/parameterised_examples/generator_examples/encoded_diff.xml b/scenarios/examples/parameterised_examples/generator_examples/encoded_diff.xml
index ebc935d98..99ea28610 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/encoded_diff.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/encoded_diff.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>diff_challenge_box</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability name="NFS Share Leak">
 			<input into="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/exif_metadata.xml b/scenarios/examples/parameterised_examples/generator_examples/exif_metadata.xml
index 9c41ed7f3..4426aa19b 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/exif_metadata.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/exif_metadata.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- Generator which outputs an image with modified exif metadata code containing a flag. -->
 		<vulnerability read_fact="images_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/hello_world.xml b/scenarios/examples/parameterised_examples/generator_examples/hello_world.xml
index cc0fedb80..0dd1e94a7 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/hello_world.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/hello_world.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/hidden_data_in_image_file.xml b/scenarios/examples/parameterised_examples/generator_examples/hidden_data_in_image_file.xml
index 0e9bfc743..dac62cfb7 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/hidden_data_in_image_file.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/hidden_data_in_image_file.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- Generator which outputs an ascii_reversible encoded string (usually a flag) appended to raw image data. -->
 		<vulnerability read_fact="images_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/qr_code_generator.xml b/scenarios/examples/parameterised_examples/generator_examples/qr_code_generator.xml
index 682e957fa..61283497e 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/qr_code_generator.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/qr_code_generator.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- Generator which outputs an image with a QR code containing a flag. -->
 		<vulnerability read_fact="images_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/random_base64.xml b/scenarios/examples/parameterised_examples/generator_examples/random_base64.xml
index 9d90d1195..41d0a986c 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/random_base64.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_base64.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/random_filename.xml b/scenarios/examples/parameterised_examples/generator_examples/random_filename.xml
index 9005bc173..e87d83ad5 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/random_filename.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_filename.xml
@@ -5,7 +5,7 @@
 
   <system>
     <system_name>example_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <!--select a vulnerability that takes leaked_filenames-->
     <vulnerability read_fact="leaked_filenames">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/random_flag.xml b/scenarios/examples/parameterised_examples/generator_examples/random_flag.xml
index 261ee289f..8bc66eb5d 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/random_flag.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_flag.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/random_hex.xml b/scenarios/examples/parameterised_examples/generator_examples/random_hex.xml
index 009f0498e..27983d1ef 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/random_hex.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_hex.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/random_word.xml b/scenarios/examples/parameterised_examples/generator_examples/random_word.xml
index 27aab4389..2033bbd11 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/random_word.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/random_word.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!--select a vulnerability that leaks strings-->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/security_audit_remit.xml b/scenarios/examples/parameterised_examples/generator_examples/security_audit_remit.xml
index cd1b7acb8..d1eee3b64 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/security_audit_remit.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/security_audit_remit.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability read_fact="strings_to_leak">
 			<input into="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/generator_examples/xor_binary_strings.xml b/scenarios/examples/parameterised_examples/generator_examples/xor_binary_strings.xml
index d85bf1951..d798e65d1 100644
--- a/scenarios/examples/parameterised_examples/generator_examples/xor_binary_strings.xml
+++ b/scenarios/examples/parameterised_examples/generator_examples/xor_binary_strings.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- Generator which outputs 2 binary strings that are XORable together to get the flag. -->
 		<vulnerability read_fact="strings_to_leak">
diff --git a/scenarios/examples/parameterised_examples/leak_multiple_values.xml b/scenarios/examples/parameterised_examples/leak_multiple_values.xml
index 8e398ea25..fb3ac355c 100644
--- a/scenarios/examples/parameterised_examples/leak_multiple_values.xml
+++ b/scenarios/examples/parameterised_examples/leak_multiple_values.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>example_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<!-- leak multiple values -->
 
diff --git a/scenarios/examples/parameterised_examples/leeds_beckett_online_store.xml b/scenarios/examples/parameterised_examples/leeds_beckett_online_store.xml
index 86c6a90d0..fd030e598 100644
--- a/scenarios/examples/parameterised_examples/leeds_beckett_online_store.xml
+++ b/scenarios/examples/parameterised_examples/leeds_beckett_online_store.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>online_store</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*onlinestore">
       <input into="domain">
diff --git a/scenarios/examples/parameterised_examples/website_scenario.xml b/scenarios/examples/parameterised_examples/website_scenario.xml
index 94fdd8a4a..019995d18 100644
--- a/scenarios/examples/parameterised_examples/website_scenario.xml
+++ b/scenarios/examples/parameterised_examples/website_scenario.xml
@@ -7,7 +7,7 @@
 	<!-- an example system hosting a parameterised randomly generated website -->
 	<system>
 		<system_name>web_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="services/unix/http/parameterised_website"/>
 
diff --git a/scenarios/examples/public_network.xml b/scenarios/examples/public_network.xml
index 7f3eb410e..6c2fca06f 100644
--- a/scenarios/examples/public_network.xml
+++ b/scenarios/examples/public_network.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>storage_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 		<service /> <!-- random network service -->
 		<network type="public_network"/>
 	</system>
diff --git a/scenarios/examples/random_vuln_with_cleanup.xml b/scenarios/examples/random_vuln_with_cleanup.xml
index 30255be90..d4ae73964 100644
--- a/scenarios/examples/random_vuln_with_cleanup.xml
+++ b/scenarios/examples/random_vuln_with_cleanup.xml
@@ -6,7 +6,7 @@
   <!-- an example with a random vulnerability and the cleanup module with some inputs. -->
   <system>
     <system_name>storage_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability/>
 
diff --git a/scenarios/examples/services_utilities_examples/2_apache_servers_one_with_mysql.xml b/scenarios/examples/services_utilities_examples/2_apache_servers_one_with_mysql.xml
index 16b14aa03..3622b7178 100644
--- a/scenarios/examples/services_utilities_examples/2_apache_servers_one_with_mysql.xml
+++ b/scenarios/examples/services_utilities_examples/2_apache_servers_one_with_mysql.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>apache_server_with_mysql</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/database/mysql"/>
 		<service module_path="modules/services/unix/http/apache"/>
@@ -16,7 +16,7 @@
 
 	<system>
 		<system_name>apache_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/http/apache"/>
 
diff --git a/scenarios/examples/services_utilities_examples/apache_service.xml b/scenarios/examples/services_utilities_examples/apache_service.xml
index 3db945547..fb128b811 100644
--- a/scenarios/examples/services_utilities_examples/apache_service.xml
+++ b/scenarios/examples/services_utilities_examples/apache_service.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>apache_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/http/apache"/>
 
diff --git a/scenarios/examples/services_utilities_examples/clean_system_with_update_unix.xml b/scenarios/examples/services_utilities_examples/clean_system_with_update_unix.xml
index 148cdc5a8..0374524bd 100644
--- a/scenarios/examples/services_utilities_examples/clean_system_with_update_unix.xml
+++ b/scenarios/examples/services_utilities_examples/clean_system_with_update_unix.xml
@@ -7,7 +7,7 @@
   <!-- an example of a clean and updated linux system -->
   <system>
     <system_name>clean_system_with_update</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <utility module_path="modules/utilities/unix/update/unix_update"/>
 
diff --git a/scenarios/examples/services_utilities_examples/firewall_configuration_example.xml b/scenarios/examples/services_utilities_examples/firewall_configuration_example.xml
index 634877628..48adce703 100644
--- a/scenarios/examples/services_utilities_examples/firewall_configuration_example.xml
+++ b/scenarios/examples/services_utilities_examples/firewall_configuration_example.xml
@@ -7,7 +7,7 @@
   <!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
   <system>
     <system_name>firewall_configuration_example</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <utility module_path="modules/utilities/unix/firewall/firewall"/>
 
diff --git a/scenarios/examples/services_utilities_examples/irc_service.xml b/scenarios/examples/services_utilities_examples/irc_service.xml
index 8a8e56f5c..cc95b1fdb 100644
--- a/scenarios/examples/services_utilities_examples/irc_service.xml
+++ b/scenarios/examples/services_utilities_examples/irc_service.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>irc_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <service type="irc"/>
 
diff --git a/scenarios/examples/services_utilities_examples/java_service.xml b/scenarios/examples/services_utilities_examples/java_service.xml
index a6edd2cd6..edea28191 100644
--- a/scenarios/examples/services_utilities_examples/java_service.xml
+++ b/scenarios/examples/services_utilities_examples/java_service.xml
@@ -7,7 +7,7 @@
 	<!-- A secure system running java -->
 	<system>
 		<system_name>system_with_java</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<utility module_path="modules/utilities/unix/languages/java"/>
 
diff --git a/scenarios/examples/services_utilities_examples/lamp_service.xml b/scenarios/examples/services_utilities_examples/lamp_service.xml
index ad8839a27..925edd991 100644
--- a/scenarios/examples/services_utilities_examples/lamp_service.xml
+++ b/scenarios/examples/services_utilities_examples/lamp_service.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>lamp_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/http/lamp"/>
 
diff --git a/scenarios/examples/services_utilities_examples/nginx_service.xml b/scenarios/examples/services_utilities_examples/nginx_service.xml
index d21d896d7..ca4c3da05 100644
--- a/scenarios/examples/services_utilities_examples/nginx_service.xml
+++ b/scenarios/examples/services_utilities_examples/nginx_service.xml
@@ -7,7 +7,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>nginx_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/http/nginx"></service>
 
diff --git a/scenarios/examples/services_utilities_examples/ntp_service.xml b/scenarios/examples/services_utilities_examples/ntp_service.xml
index 275808ef3..c3c887330 100644
--- a/scenarios/examples/services_utilities_examples/ntp_service.xml
+++ b/scenarios/examples/services_utilities_examples/ntp_service.xml
@@ -7,7 +7,7 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>ntp_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/ntp/ntp"></service>
 
diff --git a/scenarios/examples/services_utilities_examples/proftpd_service.xml b/scenarios/examples/services_utilities_examples/proftpd_service.xml
index 3542cfd5c..af29545fd 100644
--- a/scenarios/examples/services_utilities_examples/proftpd_service.xml
+++ b/scenarios/examples/services_utilities_examples/proftpd_service.xml
@@ -7,7 +7,7 @@
 	<!-- An example secure ftp server using the service proftpd -->
 	<system>
 		<system_name>proftpd_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/ftp/proftpd"></service>
 
diff --git a/scenarios/examples/services_utilities_examples/samba_service.xml b/scenarios/examples/services_utilities_examples/samba_service.xml
index d97e2d1ef..720d5a9ae 100644
--- a/scenarios/examples/services_utilities_examples/samba_service.xml
+++ b/scenarios/examples/services_utilities_examples/samba_service.xml
@@ -7,7 +7,7 @@
   <!-- A secure samba service -->
   <system>
     <system_name>samba_service</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <service module_path="modules/services/unix/smb/samba"></service>
 
diff --git a/scenarios/examples/services_utilities_examples/smbclient_utility.xml b/scenarios/examples/services_utilities_examples/smbclient_utility.xml
index abc148d8d..1cecc872a 100644
--- a/scenarios/examples/services_utilities_examples/smbclient_utility.xml
+++ b/scenarios/examples/services_utilities_examples/smbclient_utility.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>smbclient_utility</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <utility module_path="modules/utilities/unix/smb/smbclient"></utility>
 
diff --git a/scenarios/examples/services_utilities_examples/user_test_scenario.xml b/scenarios/examples/services_utilities_examples/user_test_scenario.xml
index 54d5155df..3206ef7d6 100644
--- a/scenarios/examples/services_utilities_examples/user_test_scenario.xml
+++ b/scenarios/examples/services_utilities_examples/user_test_scenario.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>user_account_module_test</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<utility module_path="modules/utilities/unix/system/accounts"/>
 
diff --git a/scenarios/examples/services_utilities_examples/vsftpd_service.xml b/scenarios/examples/services_utilities_examples/vsftpd_service.xml
index 877725630..1c9d45cfb 100644
--- a/scenarios/examples/services_utilities_examples/vsftpd_service.xml
+++ b/scenarios/examples/services_utilities_examples/vsftpd_service.xml
@@ -7,7 +7,7 @@
 	<!-- An example secure ftp server using the service vsftpd -->
 	<system>
 		<system_name>vsftpd_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<service module_path="modules/services/unix/ftp/vsftpd"></service>
 
diff --git a/scenarios/examples/services_utilities_examples/xfce_desktop.xml b/scenarios/examples/services_utilities_examples/xfce_desktop.xml
index 4eb43b219..f5114d54e 100644
--- a/scenarios/examples/services_utilities_examples/xfce_desktop.xml
+++ b/scenarios/examples/services_utilities_examples/xfce_desktop.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>desktop</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <utility module_path=".*xfce"/>
     <utility module_path=".*iceweasel" />
diff --git a/scenarios/examples/static_IP_address.xml b/scenarios/examples/static_IP_address.xml
index d9d0b6bb4..d1c84a4a8 100644
--- a/scenarios/examples/static_IP_address.xml
+++ b/scenarios/examples/static_IP_address.xml
@@ -7,13 +7,13 @@
 	<!-- an example of a system with static IP address resolution. -->
 	<system>
 		<system_name>storage_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 		<network type="private_network" range="172.16.0.0"/>
 	</system>
 
 	<system>
 		<system_name>another_system</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 		<network type="private_network" range="172.16.0.0"/>
 	</system>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/readable_shadow.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/readable_shadow.xml
index 07349150d..7e9b43ef5 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/readable_shadow.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/readable_shadow.xml
@@ -7,7 +7,7 @@
   <!-- An example access control misconfiguration, shadow file is readable -->
   <system>
     <system_name>access_control_misconfigurations_readable_shadow</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/readable_shadow"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/suid_root_nano.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/suid_root_nano.xml
index 382db5c3c..3e472bf49 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/suid_root_nano.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/suid_root_nano.xml
@@ -7,7 +7,7 @@
   <!-- An example access control misconfiguration, setuid root nano  with a test account -->
   <system>
     <system_name>access_control_misconfigurations_suid_root_nano</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/suid_root_nano"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_bash_root.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_bash_root.xml
index 6009dc5a4..64357f8b5 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_bash_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_bash_root.xml
@@ -7,7 +7,7 @@
   <!-- An example access control misconfiguration, setuid on /bin/bash allows programs to run with root privileges -->
   <system>
     <system_name>access_control_misconfigurations_uid_bash_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/uid_bash_root"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_less_root.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_less_root.xml
index a90fb83a7..d9e6035d2 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_less_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_less_root.xml
@@ -7,7 +7,7 @@
   <!-- An example access control misconfiguration, setuid on less allows root read access -->
   <system>
     <system_name>access_control_misconfigurations_uid_less_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="modules/vulnerabilities/unix/access_control_misconfigurations/uid_less_root"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_vi_root.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_vi_root.xml
index a168a8c40..e0b8030d0 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_vi_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/uid_vi_root.xml
@@ -7,7 +7,7 @@
   <!-- An example access control misconfiguration, setuid on vi allows root read/write access -->
   <system>
     <system_name>access_control_misconfigurations_vi_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/uid_vi_root"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_groups.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_groups.xml
index 874a8d853..b867ab81e 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_groups.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_groups.xml
@@ -7,7 +7,7 @@
 	<!-- An example access control misconfiguration, /etc/groups file is globally writable -->
 	<system>
 		<system_name>access_control_misconfigurations_writable_groups</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/writable_groups"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_passwd.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_passwd.xml
index 0e43bebc0..6a99abcb0 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_passwd.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_passwd.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path=".*writable_passwd" type="access_control_misconfiguration"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_shadow.xml b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_shadow.xml
index 47ecfe50e..aeb3d39d7 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_shadow.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfiguration_examples/writable_shadow.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path=".*writable_shadow" type="access_control_misconfiguration"/>
 
diff --git a/scenarios/examples/vulnerability_examples/access_control_misconfigurations_uid_vi_root.xml b/scenarios/examples/vulnerability_examples/access_control_misconfigurations_uid_vi_root.xml
index 1a856c137..19bb7eadb 100644
--- a/scenarios/examples/vulnerability_examples/access_control_misconfigurations_uid_vi_root.xml
+++ b/scenarios/examples/vulnerability_examples/access_control_misconfigurations_uid_vi_root.xml
@@ -7,7 +7,7 @@
   <!-- An example access control misconfiguration, allows vi to run as root for any user -->
   <system>
     <system_name>access_control_misconfigurations_vi_root</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/access_control_misconfigurations/uid_vi_root"/>
 
diff --git a/scenarios/examples/vulnerability_examples/chkrootkit_local_escalation.xml b/scenarios/examples/vulnerability_examples/chkrootkit_local_escalation.xml
index 7b29ddf71..3827b838a 100644
--- a/scenarios/examples/vulnerability_examples/chkrootkit_local_escalation.xml
+++ b/scenarios/examples/vulnerability_examples/chkrootkit_local_escalation.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>new_vuln_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability access="remote" privilege="user_rwx" />
 		<vulnerability module_path=".*chkrootkit" />
diff --git a/scenarios/examples/vulnerability_examples/ctf_module_examples/dc16_amadhj.xml b/scenarios/examples/vulnerability_examples/ctf_module_examples/dc16_amadhj.xml
index 6039ef162..3ad9e7bec 100644
--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/dc16_amadhj.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/dc16_amadhj.xml
@@ -8,7 +8,7 @@
 			username/pw: challenges/password  -->
 	<system>
 		<system_name>reverse_me</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path=".*dc16_amadhj.*"/>
 
diff --git a/scenarios/examples/vulnerability_examples/ctf_module_examples/hidden_file.xml b/scenarios/examples/vulnerability_examples/ctf_module_examples/hidden_file.xml
index ca2883678..4ea26a811 100644
--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/hidden_file.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/hidden_file.xml
@@ -7,7 +7,7 @@
 	<!-- example usage of the hidden_file CTF challenge module. -->
 	<system>
 		<system_name>a_system</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path=".*hidden_file.*">
 			<input into="storage_directory">
diff --git a/scenarios/examples/vulnerability_examples/ctf_module_examples/symlinks.xml b/scenarios/examples/vulnerability_examples/ctf_module_examples/symlinks.xml
index 506372c22..54932f397 100644
--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/symlinks.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/symlinks.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>symlinks</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*symlinks" />
 
diff --git a/scenarios/examples/vulnerability_examples/ctf_module_examples/two_shell_calls.xml b/scenarios/examples/vulnerability_examples/ctf_module_examples/two_shell_calls.xml
index 23034e300..327e1af6a 100644
--- a/scenarios/examples/vulnerability_examples/ctf_module_examples/two_shell_calls.xml
+++ b/scenarios/examples/vulnerability_examples/ctf_module_examples/two_shell_calls.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>ssh_leaked_keys</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*two_shell_calls"/>
 
diff --git a/scenarios/examples/vulnerability_examples/distcc_vulnerability.xml b/scenarios/examples/vulnerability_examples/distcc_vulnerability.xml
index a25129d74..f60748ac4 100644
--- a/scenarios/examples/vulnerability_examples/distcc_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/distcc_vulnerability.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>distcc_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path="vulnerabilities/unix/misc/distcc_exec" />
 
diff --git a/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml b/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
index d32aa957e..1736a7a6a 100644
--- a/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/gitlist_webapp_vulnerability.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>file_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*gitlist_040"/>
 
diff --git a/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml b/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
index 049515a13..381133c7f 100644
--- a/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
+++ b/scenarios/examples/vulnerability_examples/moinmoin_195_vulnerabilitiy.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>file_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/webapp/moinmoin_195"/>
 
diff --git a/scenarios/examples/vulnerability_examples/nfs_overshare_vulnerability.xml b/scenarios/examples/vulnerability_examples/nfs_overshare_vulnerability.xml
index d9431befa..add98bd52 100644
--- a/scenarios/examples/vulnerability_examples/nfs_overshare_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/nfs_overshare_vulnerability.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>file_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability module_path=".*nfs_overshare">
 			<input into="strings_to_leak">
diff --git a/scenarios/examples/vulnerability_examples/online_store.xml b/scenarios/examples/vulnerability_examples/online_store.xml
index b7a309663..888de7b61 100644
--- a/scenarios/examples/vulnerability_examples/online_store.xml
+++ b/scenarios/examples/vulnerability_examples/online_store.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>online_store</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*onlinestore" />
 
diff --git a/scenarios/examples/vulnerability_examples/proftpd_133c_backdoor_vulnerability.xml b/scenarios/examples/vulnerability_examples/proftpd_133c_backdoor_vulnerability.xml
index c83a60f27..a14e15a06 100644
--- a/scenarios/examples/vulnerability_examples/proftpd_133c_backdoor_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/proftpd_133c_backdoor_vulnerability.xml
@@ -7,7 +7,7 @@
   <!-- an example remote linux system with the ProFTPd 1.3.3c backdoor vulnerability -->
   <system>
     <system_name>file_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="vulnerabilities/unix/ftp/proftpd_133c_backdoor"/>
 
diff --git a/scenarios/examples/vulnerability_examples/samba_symlink_traversal_vulnerability.xml b/scenarios/examples/vulnerability_examples/samba_symlink_traversal_vulnerability.xml
index 2a8a3205b..076b93654 100644
--- a/scenarios/examples/vulnerability_examples/samba_symlink_traversal_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/samba_symlink_traversal_vulnerability.xml
@@ -7,7 +7,7 @@
   <!-- an example remote storage system running samba, with a misconfiguration vulnerability which enables symlink traversal -->
   <system>
     <system_name>samba_service</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="modules/vulnerabilities/unix/smb/samba_symlink_traversal"/>
 
diff --git a/scenarios/examples/vulnerability_examples/setuid_nmap_escalation_vulnerability.xml b/scenarios/examples/vulnerability_examples/setuid_nmap_escalation_vulnerability.xml
index 4aea1f66b..1b09ddb5d 100644
--- a/scenarios/examples/vulnerability_examples/setuid_nmap_escalation_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/setuid_nmap_escalation_vulnerability.xml
@@ -5,7 +5,7 @@
           xsi:schemaLocation="http://www.github/cliffe/SecGen/scenario">
   <system>
     <system_name>box_with_remote_user_level_vuln_and_setuid_nmap_priv_escalation</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <!--We need a remote user privilege vulnerability so we can escalate to root with setuid_nmap -->
     <vulnerability access="remote" privilege="user_rwx"/>
diff --git a/scenarios/examples/vulnerability_examples/shellshock_apache_vulnerability.xml b/scenarios/examples/vulnerability_examples/shellshock_apache_vulnerability.xml
index 79e63c660..52d3896a5 100644
--- a/scenarios/examples/vulnerability_examples/shellshock_apache_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/shellshock_apache_vulnerability.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>storage_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*shellshock_apache_cgi.*"/>
 
diff --git a/scenarios/examples/vulnerability_examples/shellshock_vulnerability.xml b/scenarios/examples/vulnerability_examples/shellshock_vulnerability.xml
index 90d4af8d7..f4c4ae820 100644
--- a/scenarios/examples/vulnerability_examples/shellshock_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/shellshock_vulnerability.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>storage_server</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="modules/vulnerabilities/unix/bash/shellshock"/>
 
diff --git a/scenarios/examples/vulnerability_examples/ssh_leaked_keys.xml b/scenarios/examples/vulnerability_examples/ssh_leaked_keys.xml
index 6740ea62d..5612ca3c3 100644
--- a/scenarios/examples/vulnerability_examples/ssh_leaked_keys.xml
+++ b/scenarios/examples/vulnerability_examples/ssh_leaked_keys.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>ssh_leaked_keys</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path="modules/vulnerabilities/unix/system/ssh_leaked_keys"/>
 
diff --git a/scenarios/examples/vulnerability_examples/ssh_root_login.xml b/scenarios/examples/vulnerability_examples/ssh_root_login.xml
index 1fc8d386f..fdb32b8bd 100644
--- a/scenarios/examples/vulnerability_examples/ssh_root_login.xml
+++ b/scenarios/examples/vulnerability_examples/ssh_root_login.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>ssh_leaked_keys</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
 
     <vulnerability module_path=".*ssh_root_login"/>
 
diff --git a/scenarios/examples/vulnerability_examples/vsftpd_vulnerability.xml b/scenarios/examples/vulnerability_examples/vsftpd_vulnerability.xml
index 09d8dfb52..4ca347688 100644
--- a/scenarios/examples/vulnerability_examples/vsftpd_vulnerability.xml
+++ b/scenarios/examples/vulnerability_examples/vsftpd_vulnerability.xml
@@ -6,7 +6,7 @@
 
 	<system>
 		<system_name>file_server</system_name>
-		<base platform="linux"/>
+		<base platform="linux" type="server"/>
 
 		<vulnerability software_name="vsftpd"/>
 
diff --git a/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml b/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
index 95af0365e..e15c7838f 100644
--- a/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
+++ b/scenarios/examples/vulnerability_examples/xfce_lightdm_root_login.xml
@@ -6,7 +6,7 @@
 
   <system>
     <system_name>xfce_lightdm_root_login</system_name>
-    <base platform="linux"/>
+    <base platform="linux" distro="Debian 7.8"/>
 
     <vulnerability module_path=".*xfce_lightdm_root_login"/>
 
diff --git a/scenarios/security_audit/team_project_scenario.xml b/scenarios/security_audit/team_project_scenario.xml
index 7382726cd..feb354076 100644
--- a/scenarios/security_audit/team_project_scenario.xml
+++ b/scenarios/security_audit/team_project_scenario.xml
@@ -213,7 +213,7 @@
   <!-- Desktop Client on NIC2 -->
   <system>
     <system_name>desktop</system_name>
-    <base platform="linux"/>
+    <base platform="linux" type="server"/>
     <vulnerability module_path=".*xfce_lightdm_root_login"/>
     <utility module_path=".*iceweasel" />
     <network module_path=".*private_network_2"/>