diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index ac0a442c5..40979a9aa 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -138,16 +138,14 @@
                             {% endif %}
                         </td>
                     </tr>
+                    {% if object.disk %}
                     <tr>
                         <th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %} <i class='text-warning'>{% trans "(deprecated)" %}</i></th>
                         <td>
-                            {% if object.disk %}
-                                {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
-                            {% else %}
-                                {{ ''|placeholder }}
-                            {% endif %}
+                            {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %}
                         </td>
                     </tr>
+                    {% endif %}
                     <tr>
                         <th scope="row"><i class="mdi mdi-harddisk"></i> {% trans "Virtual Disk Space" %}</th>
                         <td>
@@ -178,6 +176,26 @@
         {% plugin_right_page object %}
     </div>
 </div>
+
+<div class="row">
+  <div class="col col-md-12">
+    <div class="card">
+      <h5 class="card-header">{% trans "Virtual Disks" %}</h5>
+      <div class="card-body htmx-container table-responsive"
+        hx-get="{% url 'virtualization:virtualdisk_list' %}?virtual_machine_id={{ object.pk }}"
+        hx-trigger="load"
+      ></div>
+      {% if perms.virtualization.add_virtualdisk %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'virtualization:virtualdisk_add' %}?device={{ object.device.pk }}&virtual_machine={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+            <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Virtual Disk" %}
+          </a>
+        </div>
+      {% endif %}
+    </div>
+  </div>
+</div>
+
 <div class="row">
     <div class="col col-md-12">
         {% plugin_full_width_page object %}
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index 7ffe92984..c512fe9ca 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -85,7 +85,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
     # Counter fields
     interface_count = serializers.IntegerField(read_only=True)
     virtual_disk_count = serializers.IntegerField(read_only=True)
-    virtual_disk_size = serializers.IntegerField(read_only=True)
+    virtual_disk_space = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = VirtualMachine
@@ -93,7 +93,7 @@ class VirtualMachineSerializer(NetBoxModelSerializer):
             'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'platform',
             'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments',
             'config_template', 'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated',
-            'interface_count', 'virtual_disk_count', 'virtual_disk_size',
+            'interface_count', 'virtual_disk_count', 'virtual_disk_space',
         ]
         validators = []
 
@@ -106,7 +106,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
             'id', 'url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'role', 'tenant', 'platform',
             'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments',
             'local_context_data', 'tags', 'custom_fields', 'config_context', 'created', 'last_updated',
-            'interface_count', 'virtual_disk_count', 'virtual_disk_size',
+            'interface_count', 'virtual_disk_count', 'virtual_disk_space',
         ]
 
     @extend_schema_field(serializers.JSONField(allow_null=True))
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index ff6932f54..c91370623 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -55,7 +55,7 @@ class ClusterViewSet(NetBoxModelViewSet):
 
 class VirtualMachineViewSet(ConfigContextQuerySetMixin, NetBoxModelViewSet):
     queryset = VirtualMachine.objects.annotate(
-        virtual_disk_size=Sum('virtualdisks__size')
+        virtual_disk_space=Sum('virtualdisks__size')
     ).prefetch_related(
         'site', 'cluster', 'device', 'role', 'tenant', 'platform', 'primary_ip4', 'primary_ip6', 'tags'
     )