3 files changed, 13 insertions, 9 deletions
diff --git a/units/laramie/jobs.pxu b/units/laramie/jobs.pxu
index 3843f11..8639e6d 100644
--- a/units/laramie/jobs.pxu
+++ b/units/laramie/jobs.pxu
@@ -1,5 +1,7 @@
 id: laramie/additional-packages-check
-plugin: manual
+category_id: laramie
+plugin: user-interact-verify
+command: check_laramie_pkg_list pkg
 _summary: According to SoW 3.4.2 check additional packages installed
 _purpose:
 Check if additional packages in image
@@ -9,10 +11,11 @@ _steps:
 _verification:
 Is every packages available?
 estimated_duration: 60s
-category_id: laramie
 
 id: laramie/language-packages-check
-plugin: manual
+category_id: laramie
+plugin: user-interact-verify
+command: check_laramie_pkg_list language
 _summary: According to SoW 3.4.3 check language packages installed
 _purpose:
 Check if language packages in image
@@ -21,10 +24,11 @@ _steps:
 _verification:
 Is every packages available?
 estimated_duration: 60s
-category_id: laramie
 
 id: laramie/printer-packages-check
-plugin: manual
+category_id: laramie
+plugin: user-interact-verify
+command: check_laramie_pkg_list printer
 _summary: According to SoW 3.4.6 check printer packages installed
 _purpose:
 Check if printer packages in image
@@ -33,7 +37,6 @@ _steps:
 _verification:
 Is every packages available?
 estimated_duration: 60s
-category_id: laramie
 
 id: laramie/dp-to-vga-active
 flags: also-after-suspend-manual
@@ -53,7 +56,6 @@ _verification:
 Was the desktop displayed correctly with on the screen connected using a
 "Display port to VGA active" adapter in every mode?
 
- 
 id: laramie/dp-to-dvi-active
 flags: also-after-suspend-manual
 estimated_duration: 15.0
diff --git a/units/laramie/laramie-auto.pxu b/units/laramie/laramie-auto.pxu
index d50a69a..4af773f 100644
--- a/units/laramie/laramie-auto.pxu
+++ b/units/laramie/laramie-auto.pxu
@@ -8,4 +8,5 @@ com.canonical.Certification::miscellanea/efi_boot_mode
 nested_part:
 oem-generic-auto
 mandatory_include:
+ com.canonical.certification::bluez-automated
 exclude:
diff --git a/units/laramie/laramie-full.pxu b/units/laramie/laramie-full.pxu
index 647abf7..37d8810 100644
--- a/units/laramie/laramie-full.pxu
+++ b/units/laramie/laramie-full.pxu
@@ -11,6 +11,7 @@ include:
 laramie/dp-to-hdmi-active
 laramie/dp-to-hdmi-passive
 nested_part:
- oem-generic-full
+ oem-generic-full-20-04
 mandatory_include:
-exclude: \ No newline at end of file
+ com.canonical.certification::bluez-automated
+exclude: