diff --git a/artifacts/definitions/Windows/Detection/Yara/Device.yaml b/artifacts/definitions/Windows/Detection/Yara/Device.yaml
new file mode 100644
index 00000000000..3092b862832
--- /dev/null
+++ b/artifacts/definitions/Windows/Detection/Yara/Device.yaml
@@ -0,0 +1,91 @@
+name: Windows.Detection.Yara.Device
+author: Matt Green - @mgreen27
+description: |
+  This artifact enables running Yara over a Physical device and offset
+  specific targeting.
+
+  There are 2 kinds of Yara rules that can be deployed:
+
+  1. Url link to a yara rule.  
+  2. or a Standard Yara rule attached as a parameter.  
+
+  Only one method of Yara will be applied and search order is as above. The
+  default is targeting the Master Boot Record (MBR).
+
+  Note: by default the Yara scan will stop after one hit. Multi-string rules will also only
+  show one string in returned rows.
+
+  Due to scanning raw devices and size being potentially very large I have included
+  an example on how to upload the MBR as the default yara rule.
+
+parameters:
+  - name: DevicePath
+    default: \\.\PHYSICALDRIVE0
+    description: Raw Device for main disk to target.
+  - name: StartOffest
+    type: int
+    default: 0
+  - name: ScanLength
+    type: int
+    default: 512
+  - name: YaraUrl
+    description: If configured will attempt to download Yara rules from Url
+    type: upload
+  - name: YaraRule
+    type: yara
+    default: |
+        rule MBR {
+            meta:
+                author = "Matt Green - @mgreen27"
+                description = "Checks MBR header at offset 510 and collects MBR in HitContext"
+            strings:
+                $mbr = /^.{512}$/ //first entry covering bytes we want to upload.
+                $mbrheader = { 55 AA }
+            condition:
+                $mbr and $mbrheader at 510
+        }
+  - name: NumberOfHits
+    description: THis artifact will stop by default at one hit. This setting allows additional hits
+    default: 1
+    type: int
+  - name: ContextBytes
+    description: Include this amount of bytes around hit as context.
+    default: 0
+    type: int64
+
+sources:
+  - query: |
+      -- check which Yara to use
+      LET yara_rules <= YaraUrl || YaraRule
+
+      -- target yara with raw_file pachspec
+      SELECT
+        DevicePath,
+        StartOffest,
+        ScanLength,
+        Namespace,
+        Rule,
+        Meta,
+        Tags,
+        String.Name as YaraString,
+        String.Offset AS HitOffset,
+        upload(
+            accessor='data',
+            file=String.Data,
+            name=format(format='%s_%s',
+                    args=[basename(path=DevicePath),str(str=String.Offset)])
+                ) AS HitContext
+      FROM yara(files=pathspec(
+                    DelegateAccessor="raw_file",
+                    DelegatePath=DevicePath,
+                    Path=StartOffest),
+                accessor='offset',
+                start=0,
+                end=ScanLength,
+                rules=yara_rules,
+                context=ContextBytes,
+                number=NumberOfHits )
+
+column_types:
+  - name: HitContext
+    type: upload_preview
diff --git a/artifacts/testdata/files/MBR b/artifacts/testdata/files/MBR
new file mode 100755
index 00000000000..9ba4ffa47c4
Binary files /dev/null and b/artifacts/testdata/files/MBR differ
diff --git a/artifacts/testdata/server/testcases/yara_detection.in.yaml b/artifacts/testdata/server/testcases/yara_detection.in.yaml
index b95478d2724..03469205a5a 100644
--- a/artifacts/testdata/server/testcases/yara_detection.in.yaml
+++ b/artifacts/testdata/server/testcases/yara_detection.in.yaml
@@ -104,3 +104,9 @@ Queries:
     CleanContext(HitContext=HitContext),
     Size,Rule,Mtime,Atime,Ctime,Btime
     FROM Artifact.Generic.Detection.Yara.Glob(DateBefore='2021-04-01',ContextBytes=10,YaraRule=MZRule)
+
+  # test Windows.Detection.Yara.Device (shoudl also work cross platform)
+  - SELECT relpath(path=DevicePath, base=srcDir, sep="/") as TestPath,
+      CleanContext(HitContext=HitContext),
+      StartOffest,ScanLength,Rule,YaraString,HitOffset
+    FROM Artifact.Windows.Detection.Yara.Device(DevicePath=srcDir + "/artifacts/testdata/files/MBR")
diff --git a/artifacts/testdata/server/testcases/yara_detection.out.yaml b/artifacts/testdata/server/testcases/yara_detection.out.yaml
index 6d644f4d4e7..c18f64b9451 100644
--- a/artifacts/testdata/server/testcases/yara_detection.out.yaml
+++ b/artifacts/testdata/server/testcases/yara_detection.out.yaml
@@ -147,4 +147,19 @@ FROM scope()
   "Ctime": "2021-03-21T05:57:50.184145696Z",
   "Btime": "2021-03-01T05:57:50.184086639Z"
  }
+]SELECT relpath(path=DevicePath, base=srcDir, sep="/") as TestPath, CleanContext(HitContext=HitContext), StartOffest,ScanLength,Rule,YaraString,HitOffset FROM Artifact.Windows.Detection.Yara.Device(DevicePath=srcDir + "/artifacts/testdata/files/MBR")[
+ {
+  "TestPath": "artifacts/testdata/files/MBR",
+  "CleanContext(HitContext=HitContext)": {
+   "StoredSize": 512,
+   "Path": "data",
+   "Size": 512,
+   "sha256": "0c05714e525951781417248c7ee8a2f42ec5bfa04f8f3e0e10cd118e438a67eb"
+  },
+  "StartOffest": 0,
+  "ScanLength": 512,
+  "Rule": "MBR",
+  "YaraString": "$mbr",
+  "HitOffset": 0
+ }
 ]
\ No newline at end of file