diff --git a/providers/base/units/image/jobs.pxu b/providers/base/units/image/jobs.pxu
index d4e555196c..3326852cab 100644
--- a/providers/base/units/image/jobs.pxu
+++ b/providers/base/units/image/jobs.pxu
@@ -78,8 +78,10 @@ flags: preserve-locale
 id: image/model-grade
 category_id: image
 _summary: Check that the model grade is correctly set
+imports: from com.canonical.plainbox import manifest
 requires:
  lsb.distributor_id == "Ubuntu Core" and int(lsb.release) >= 20
+ manifest.dangerous_grade_core_image == 'False'
 _purpose:
  Images with the 'dangerous' grade (the lowest of all available grades)
  results in certain security measures being relaxed.
diff --git a/providers/base/units/image/manifest.pxu b/providers/base/units/image/manifest.pxu
new file mode 100644
index 0000000000..780412bf0c
--- /dev/null
+++ b/providers/base/units/image/manifest.pxu
@@ -0,0 +1,5 @@
+unit: manifest entry
+id: dangerous_grade_core_image
+_name: Image is using 'dangerous' grade (should be set to 'No' unless you're doing SRU testing)
+_prompt: Does this setup have the following configuration?
+value-type: bool