diff --git a/netbox/templates/django/forms/widgets/checkbox.html b/netbox/templates/django/forms/widgets/checkbox.html
index 359657136..dc0496044 100644
--- a/netbox/templates/django/forms/widgets/checkbox.html
+++ b/netbox/templates/django/forms/widgets/checkbox.html
@@ -4,4 +4,4 @@
   _selected_action to avoid breaking the admin UI.
 {% endcomment %}
 {% if widget.name != '_selected_action' %}<input type="hidden" name="{{ widget.name }}" value="">{% endif %}
-{% include "django/forms/widgets/input.html" %}
+<input type="checkbox" name="{{ widget.name }}"{% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %} {% include "django/forms/widgets/attrs.html" %} class="{{ widget.attrs.class }} form-check-input">
diff --git a/netbox/templates/django/forms/widgets/input.html b/netbox/templates/django/forms/widgets/input.html
new file mode 100644
index 000000000..7f41bef26
--- /dev/null
+++ b/netbox/templates/django/forms/widgets/input.html
@@ -0,0 +1 @@
+<input type="{{ widget.type }}" name="{{ widget.name }}"{% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %}{% include "django/forms/widgets/attrs.html" %} class="{{ widget.attrs.class }} form-control">
diff --git a/netbox/templates/django/forms/widgets/select.html b/netbox/templates/django/forms/widgets/select.html
new file mode 100644
index 000000000..4ee1378ce
--- /dev/null
+++ b/netbox/templates/django/forms/widgets/select.html
@@ -0,0 +1,5 @@
+<select name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %} class="{{ widget.attrs.class }} {% if 'size' in widget.attrs %}form-select form-select-sm{% else %}netbox-static-select{% endif %}">{% for group_name, group_choices, group_index in widget.optgroups %}{% if group_name %}
+  <optgroup label="{{ group_name }}">{% endif %}{% for option in group_choices %}
+  {% include option.template_name with widget=option %}{% endfor %}{% if group_name %}
+  </optgroup>{% endif %}{% endfor %}
+</select>
\ No newline at end of file
diff --git a/netbox/templates/django/forms/widgets/textarea.html b/netbox/templates/django/forms/widgets/textarea.html
new file mode 100644
index 000000000..a179d3342
--- /dev/null
+++ b/netbox/templates/django/forms/widgets/textarea.html
@@ -0,0 +1,2 @@
+<textarea name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %} class="{{ widget.attrs.class }} form-control">
+{% if widget.value %}{{ widget.value }}{% endif %}</textarea>
\ No newline at end of file
diff --git a/netbox/utilities/forms/mixins.py b/netbox/utilities/forms/mixins.py
index 2d6c20fcc..1ff3246ce 100644
--- a/netbox/utilities/forms/mixins.py
+++ b/netbox/utilities/forms/mixins.py
@@ -32,18 +32,18 @@ class BootstrapMixin:
             if field.widget.__class__ in exempt_widgets:
                 continue
 
-            elif isinstance(field.widget, forms.CheckboxInput):
-                field.widget.attrs['class'] = f'{css} form-check-input'
-
-            elif isinstance(field.widget, forms.SelectMultiple) and 'size' in field.widget.attrs:
-                # Use native Bootstrap class for multi-line <select> widgets
-                field.widget.attrs['class'] = f'{css} form-select form-select-sm'
-
-            elif isinstance(field.widget, (forms.Select, forms.SelectMultiple)):
-                field.widget.attrs['class'] = f'{css} netbox-static-select'
-
-            else:
-                field.widget.attrs['class'] = f'{css} form-control'
+            # elif isinstance(field.widget, forms.CheckboxInput):
+            #     field.widget.attrs['class'] = f'{css} form-check-input'
+            #
+            # elif isinstance(field.widget, forms.SelectMultiple) and 'size' in field.widget.attrs:
+            #     # Use native Bootstrap class for multi-line <select> widgets
+            #     field.widget.attrs['class'] = f'{css} form-select form-select-sm'
+            #
+            # elif isinstance(field.widget, (forms.Select, forms.SelectMultiple)):
+            #     field.widget.attrs['class'] = f'{css} netbox-static-select'
+            #
+            # else:
+            #     field.widget.attrs['class'] = f'{css} form-control'
 
             if field.required and not isinstance(field.widget, forms.FileInput):
                 field.widget.attrs['required'] = 'required'