diff --git a/app/itam/models/device.py b/app/itam/models/device.py
index 8642271a..cce237b8 100644
--- a/app/itam/models/device.py
+++ b/app/itam/models/device.py
@@ -1,3 +1,5 @@
+import json
+
 from django.db import models
 
 from access.fields import *
@@ -115,6 +117,22 @@ class Device(DeviceCommonFieldsName, SaveHistory):
 
                 config['software'] = config['software'] + [ software_action ]
 
+        config: dict = config
+
+        from config_management.models.groups import ConfigGroupHosts
+
+        if self.id:
+
+            config_groups = ConfigGroupHosts.objects.filter(host=self.id).order_by('group')
+
+            for group in config_groups:
+
+                rendered_config = group.group.render_config()
+
+                if rendered_config:
+
+                    config.update(json.loads(group.group.render_config()))
+
         return config