diff --git a/app/itam/forms/operating_system/update.py b/app/itam/forms/operating_system/update.py
index 3816deff..a00687b6 100644
--- a/app/itam/forms/operating_system/update.py
+++ b/app/itam/forms/operating_system/update.py
@@ -11,6 +11,7 @@ class Update(forms.ModelForm):
         model = OperatingSystem
         fields = [
             "name",
+            'publisher',
             'slug',
             'id',
             'organization',
diff --git a/app/itam/migrations/0010_operatingsystem_publisher_software_publisher.py b/app/itam/migrations/0010_operatingsystem_publisher_software_publisher.py
new file mode 100644
index 00000000..1f5df1d6
--- /dev/null
+++ b/app/itam/migrations/0010_operatingsystem_publisher_software_publisher.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0.6 on 2024-05-23 12:48
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_manufacturer'),
+        ('itam', '0009_devicemodel_device_device_model'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='operatingsystem',
+            name='publisher',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.manufacturer'),
+        ),
+    ]
diff --git a/app/itam/models/device.py b/app/itam/models/device.py
index 9429c3b3..e8bc27c3 100644
--- a/app/itam/models/device.py
+++ b/app/itam/models/device.py
@@ -47,7 +47,6 @@ class Device(DeviceCommonFieldsName, SaveHistory):
         default = None,
         null = True,
         blank= True
-        
     )
 
     device_type = models.ForeignKey(
diff --git a/app/itam/models/operating_system.py b/app/itam/models/operating_system.py
index d9cfb494..00af2ebe 100644
--- a/app/itam/models/operating_system.py
+++ b/app/itam/models/operating_system.py
@@ -4,6 +4,7 @@ from access.fields import *
 from access.models import TenancyObject
 
 from core.mixin.history_save import SaveHistory
+from core.models.manufacturer import Manufacturer
 
 
 
@@ -41,6 +42,14 @@ class OperatingSystemFieldsName(OperatingSystemCommonFields):
 
 class OperatingSystem(OperatingSystemFieldsName, SaveHistory):
 
+    publisher = models.ForeignKey(
+        Manufacturer,
+        on_delete=models.CASCADE,
+        default = None,
+        null = True,
+        blank= True
+    )
+
     def __str__(self):
 
         return self.name
diff --git a/app/itam/templates/itam/operating_system_index.html.j2 b/app/itam/templates/itam/operating_system_index.html.j2
index a44d2016..63891321 100644
--- a/app/itam/templates/itam/operating_system_index.html.j2
+++ b/app/itam/templates/itam/operating_system_index.html.j2
@@ -9,16 +9,20 @@
 <table class="data">
     <tr>
         <th>Name</th>
-        <th>Created</th>
-        <th>Modified</th>
+        <th>Publisher</th>
         <th>Organization</th>
         <th>&nbsp;</th>
     </tr>
     {% for operating_system in operating_systems %}
     <tr>
         <td><a href="{% url 'ITAM:_operating_system_view' pk=operating_system.id %}">{{ operating_system.name }}</a></td>
-        <td>{{ operating_system.created }}</td>
-        <td>{{ operating_system.modified }}</td>
+        <td>
+        {% if operating_system.publisher %}
+            <a href="{% url 'Settings:_manufacturer_view' pk=operating_system.publisher.id %}">{{ operating_system.publisher }}</a>
+        {% else %}
+            -
+        {% endif %}
+        </td>
         <td>{% if operating_system.is_global %}Global{% else %}{{ operating_system.organization }}{% endif %}</td>
         <td><a href="{% url 'ITAM:_operating_system_delete' pk=operating_system.id %}">Delete</a></td>
     </tr>
diff --git a/app/itam/views/operating_system.py b/app/itam/views/operating_system.py
index c21b2fae..db4d0358 100644
--- a/app/itam/views/operating_system.py
+++ b/app/itam/views/operating_system.py
@@ -98,6 +98,7 @@ class Add(PermissionRequiredMixin, OrganizationPermission, generic.CreateView):
     template_name = 'form.html.j2'
     fields = [
         'name',
+        'publisher',
         'organization',
         'is_global'
     ]
@@ -111,9 +112,6 @@ class Add(PermissionRequiredMixin, OrganizationPermission, generic.CreateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['model_pk'] = self.kwargs['pk']
-        context['model_name'] = self.model._meta.verbose_name.replace(' ', '')
-
         context['content_title'] = 'Add Operating System'
 
         return context