diff --git a/src/plugins/analysis/device_tree/code/device_tree.py b/src/plugins/analysis/device_tree/code/device_tree.py
index dc6bf47efd..372df96aee 100644
--- a/src/plugins/analysis/device_tree/code/device_tree.py
+++ b/src/plugins/analysis/device_tree/code/device_tree.py
@@ -1,38 +1,73 @@
-from analysis.PluginBase import AnalysisBasePlugin
+import io
+
+import pydantic
+
 from helperFunctions.tag import TagColor
-from objects.file import FileObject
 from plugins.mime_blacklists import MIME_BLACKLIST_COMPRESSED
+from analysis.plugin.compat import AnalysisBasePluginAdapterMixin
+from analysis.plugin import AnalysisPluginV0, Tag
+from typing import Optional, List, Dict
 
 from ..internal.device_tree_utils import dump_device_trees
 
 
-class AnalysisPlugin(AnalysisBasePlugin):
-    """
-    Device Tree Plug-in
-    """
-
-    NAME = 'device_tree'
-    DESCRIPTION = 'get the device tree in text from the device tree blob'
-    VERSION = '1.0.1'
-    MIME_BLACKLIST = [*MIME_BLACKLIST_COMPRESSED, 'audio', 'image', 'video']  # noqa: RUF012
-    FILE = __file__
-
-    def process_object(self, file_object: FileObject):
-        file_object.processed_analysis[self.NAME] = {'summary': []}
-
-        device_trees = dump_device_trees(file_object.binary)
-        if device_trees:
-            file_object.processed_analysis[self.NAME]['device_trees'] = device_trees
-            for result in device_trees:
-                model = result.get('model')
-                if model:
-                    file_object.processed_analysis[self.NAME]['summary'].append(model)
-            self.add_analysis_tag(
-                file_object=file_object,
-                tag_name=self.NAME,
-                value=self.NAME.replace('_', ' '),
-                color=TagColor.ORANGE,
-                propagate=False,
-            )
+class AnalysisPlugin(AnalysisPluginV0, AnalysisBasePluginAdapterMixin):
+    class Schema(pydantic.BaseModel):
+        class DeviceTree(pydantic.BaseModel):
+            header: Optional[dict]
+            device_tree: Optional[str]
+            model: Optional[str]
+            description: Optional[str]
+            offset: int
+
+        #: A list of device trees
+        device_trees: List[DeviceTree]
+
+    def __init__(self):
+        metadata = AnalysisPluginV0.MetaData(
+            name='device_tree',
+            description='get the device tree in text from the device tree blob',
+            version='1.1.0',
+            system_version=None,
+            dependencies=[],
+            mime_blacklist=[*MIME_BLACKLIST_COMPRESSED, 'audio', 'image', 'video'],
+            mime_whitelist=[],
+            timeout=10,
+            Schema=AnalysisPlugin.Schema,
+        )
+        super().__init__(metadata=metadata)
 
-        return file_object
+    def summarize(self, result: Schema):
+        models = []
+        for device_tree in result.device_trees:
+            model = device_tree.model
+            if not model:
+                continue
+            models.append(model)
+
+        if not models:
+            return ['unknown-model']
+
+        return models
+
+    def analyze(
+        self,
+        file_handle: io.FileIO,
+        virtual_file_path: dict,
+        analyses: Dict[str, dict],
+    ) -> Optional[Schema]:
+        del virtual_file_path, analyses
+        device_trees = dump_device_trees(file_handle.readall())
+        if len(device_trees) == 0:
+            return None
+        return AnalysisPlugin.Schema(device_trees=device_trees)
+
+    def get_tags(self, result, summary):
+        del result, summary
+        return [
+            Tag(
+                name=self.metadata.name,
+                value='device tree',
+                color=TagColor.ORANGE,
+            ),
+        ]
diff --git a/src/plugins/analysis/device_tree/view/device_tree.html b/src/plugins/analysis/device_tree/view/device_tree.html
index 34b8bab4e0..5f4759f7e6 100644
--- a/src/plugins/analysis/device_tree/view/device_tree.html
+++ b/src/plugins/analysis/device_tree/view/device_tree.html
@@ -40,20 +40,7 @@
 
 
 {% block analysis_result_details %}
-
-{# Don't break on legacy result #}
-{% if "device_tree" in analysis_result %}
-    <tr class="table-warning">
-        <td> Deprecation Warning </td>
-        <td> Analysis version is deprecated, please update the analysis </td>
-    </tr>
-    <tr>
-        <td> Device Tree </td>
-        {{ device_tree_table_cell(analysis_result.device_tree, "1") }}
-    </tr>
-{% endif %}
-
-{% for dt_dict in analysis_result.get("device_trees", []) %}
+{% for dt_dict in analysis_result["device_trees"] %}
     <tr data-toggle="collapse" data-target="#collapse-{{ dt_dict.offset }}">
         <td class="clickable" colspan=2>
             <i class="fas fa-angle-down"></i>