diff --git a/README.md b/README.md
index d661623..8ede3bf 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ See docs directory
 
 If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (see [Requirements](#requirements) above).
 
-The Cudo API client is generated in the cudo-compute-market repo using the "make tf" command, copy the generated "compute" folder from cudo-compute-market/clients/go-grpc/ to terraform-provider-cudo/internal/.
+The Cudo API client is generated in the cudo-compute-market repo using the `make tf` command, copy the generated "compute" folder from cudo-compute-market/clients/go-grpc/ to terraform-provider-cudo/internal/.
 
 To compile the provider, run `go install`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
 
diff --git a/docs/data-sources/storage_disk.md b/docs/data-sources/storage_disk.md
new file mode 100644
index 0000000..57725da
--- /dev/null
+++ b/docs/data-sources/storage_disk.md
@@ -0,0 +1,35 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "cudo_storage_disk Data Source - terraform-provider-cudo"
+subcategory: ""
+description: |-
+  Disk data source
+---
+
+# cudo_storage_disk (Data Source)
+
+Disk data source
+
+## Example Usage
+
+```terraform
+data "cudo_storage_disk" "storage_disk_datasource" {
+  id = "my-disk"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `id` (String) Storage disk ID.
+
+### Optional
+
+- `project_id` (String) The unique identifier of the project the disk is in.
+
+### Read-Only
+
+- `data_center_id` (String) The unique identifier of the datacenter where the disk is located.
+- `size_gib` (Number) Size of the storage disk in GiB
diff --git a/docs/resources/storage_disk.md b/docs/resources/storage_disk.md
new file mode 100644
index 0000000..39bcbeb
--- /dev/null
+++ b/docs/resources/storage_disk.md
@@ -0,0 +1,34 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "cudo_storage_disk Resource - terraform-provider-cudo"
+subcategory: ""
+description: |-
+  Storage disk resource
+---
+
+# cudo_storage_disk (Resource)
+
+Storage disk resource
+
+## Example Usage
+
+```terraform
+resource "cudo_storage_disk" "my-storage-disk" {
+  data_center_id = "gb-bournemouth-1"
+  id             = "my-disk"
+  size_gib       = 100
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `data_center_id` (String) The unique identifier of the datacenter where the disk is located.
+- `id` (String) The unique identifier of the storage disk
+- `size_gib` (Number) Size of the storage disk in GiB
+
+### Optional
+
+- `project_id` (String) The project the storage disk is in.
diff --git a/docs/resources/vm.md b/docs/resources/vm.md
index cc46b60..490d751 100644
--- a/docs/resources/vm.md
+++ b/docs/resources/vm.md
@@ -30,8 +30,15 @@ resource "cudo_vm" "my-vm-max-price" {
   ]
 }
 
+resource "cudo_storage_disk" "my-storage-disk" {
+  data_center_id = "gb-bournemouth-1"
+  id             = "my-disk"
+  size_gib       = 100
+}
+
 # pick a specific data center and machine type
 resource "cudo_vm" "my-vm" {
+  depends_on     = [cudo_storage_disk.my-storage-disk]
   id             = "terra-vm-1"
   machine_type   = "standard"
   data_center_id = "gb-bournemouth-1"
@@ -41,6 +48,11 @@ resource "cudo_vm" "my-vm" {
     image_id = "debian-11"
     size_gib = 50
   }
+  storage_disks = [
+    {
+      disk_id = "my-disk"
+    }
+  ]
   ssh_key_source = "project"
   start_script   = <<EOF
                      touch /multiline-script.txt
@@ -64,7 +76,6 @@ resource "cudo_vm" "my-vm" {
 - `gpu_model` (String) The model of the GPU.
 - `gpus` (Number) Number of GPUs
 - `machine_type` (String) VM machine type, from machine type data source
-- `max_price_hr` (String) The maximum price per hour for the VM instance
 - `memory_gib` (Number) Amount of VM memory in GiB
 - `metadata` (Map of String) Metadata values to associate with the VM instance
 - `networks` (Attributes List) Network adapters for private networks (see [below for nested schema](#nestedatt--networks))
@@ -74,6 +85,7 @@ resource "cudo_vm" "my-vm" {
 - `ssh_key_source` (String) Which SSH keys to add to the VM: project (default), user or custom
 - `ssh_keys` (List of String) List of SSH keys to add to the VM, ssh_key_source must be set to custom
 - `start_script` (String) A script to run when VM boots
+- `storage_disks` (Attributes Set) Specification for storage disks (see [below for nested schema](#nestedatt--storage_disks))
 - `vcpus` (Number) Number of VCPUs
 
 ### Read-Only
@@ -111,3 +123,11 @@ Read-Only:
 
 - `external_ip_address` (String) The external IP address of the NIC.
 - `internal_ip_address` (String) The internal IP address of the NIC.
+
+
+<a id="nestedatt--storage_disks"></a>
+### Nested Schema for `storage_disks`
+
+Required:
+
+- `disk_id` (String) ID of storage disk to attach to vm
diff --git a/examples/data-sources/cudo_storage_disk/data-source.tf b/examples/data-sources/cudo_storage_disk/data-source.tf
new file mode 100644
index 0000000..5595074
--- /dev/null
+++ b/examples/data-sources/cudo_storage_disk/data-source.tf
@@ -0,0 +1,3 @@
+data "cudo_storage_disk" "storage_disk_datasource" {
+  id = "my-disk"
+}
\ No newline at end of file
diff --git a/examples/resources/cudo_storage_disk/resource.tf b/examples/resources/cudo_storage_disk/resource.tf
new file mode 100644
index 0000000..7c48074
--- /dev/null
+++ b/examples/resources/cudo_storage_disk/resource.tf
@@ -0,0 +1,5 @@
+resource "cudo_storage_disk" "my-storage-disk" {
+  data_center_id = "gb-bournemouth-1"
+  id             = "my-disk"
+  size_gib       = 100
+}
\ No newline at end of file
diff --git a/examples/resources/cudo_vm/resource.tf b/examples/resources/cudo_vm/resource.tf
index 94dddf8..8dd84a4 100644
--- a/examples/resources/cudo_vm/resource.tf
+++ b/examples/resources/cudo_vm/resource.tf
@@ -15,8 +15,15 @@ resource "cudo_vm" "my-vm-max-price" {
   ]
 }
 
+resource "cudo_storage_disk" "my-storage-disk" {
+  data_center_id = "gb-bournemouth-1"
+  id             = "my-disk"
+  size_gib       = 100
+}
+
 # pick a specific data center and machine type
 resource "cudo_vm" "my-vm" {
+  depends_on     = [cudo_storage_disk.my-storage-disk]
   id             = "terra-vm-1"
   machine_type   = "standard"
   data_center_id = "gb-bournemouth-1"
@@ -26,6 +33,11 @@ resource "cudo_vm" "my-vm" {
     image_id = "debian-11"
     size_gib = 50
   }
+  storage_disks = [
+    {
+      disk_id = "my-disk"
+    }
+  ]
   ssh_key_source = "project"
   start_script   = <<EOF
                      touch /multiline-script.txt
diff --git a/internal/provider/network_resource.go b/internal/provider/network_resource.go
index fc3b4ed..ae99866 100644
--- a/internal/provider/network_resource.go
+++ b/internal/provider/network_resource.go
@@ -145,9 +145,11 @@ func (r *NetworkResource) Create(ctx context.Context, req resource.CreateRequest
 		return
 	}
 
-	state.Gateway = types.StringValue(network.Gateway)
-	state.ExternalIPAddress = types.StringValue(network.ExternalIpAddress)
-	state.InternalIPAddress = types.StringValue(network.InternalIpAddress)
+	if network != nil {
+		state.Gateway = types.StringValue(network.Gateway)
+		state.ExternalIPAddress = types.StringValue(network.ExternalIpAddress)
+		state.InternalIPAddress = types.StringValue(network.InternalIpAddress)
+	}
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 }
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
index bd05e8e..de7507d 100644
--- a/internal/provider/provider.go
+++ b/internal/provider/provider.go
@@ -198,6 +198,7 @@ func (p *CudoProvider) Configure(ctx context.Context, req provider.ConfigureRequ
 func (p *CudoProvider) Resources(ctx context.Context) []func() resource.Resource {
 	return []func() resource.Resource{
 		NewSecurityGroupResource,
+		NewStorageDiskResource,
 		NewNetworkResource,
 		NewVMImageResource,
 		NewVMResource,
@@ -206,6 +207,7 @@ func (p *CudoProvider) Resources(ctx context.Context) []func() resource.Resource
 
 func (p *CudoProvider) DataSources(ctx context.Context) []func() datasource.DataSource {
 	return []func() datasource.DataSource{
+		NewStorageDiskDataSource,
 		NewVMImagesDataSource,
 		NewVMDataCentersDataSource,
 		NewVMDataSource,
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
index d77e4c4..c1991ad 100644
--- a/internal/provider/provider_test.go
+++ b/internal/provider/provider_test.go
@@ -29,7 +29,6 @@ var testAccProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServe
 }
 
 func getProviderConfig() string {
-
 	return fmt.Sprintf(`
 provider "cudo" {
   api_key            = "%s"
diff --git a/internal/provider/storage_disk_data_source.go b/internal/provider/storage_disk_data_source.go
new file mode 100644
index 0000000..a29202e
--- /dev/null
+++ b/internal/provider/storage_disk_data_source.go
@@ -0,0 +1,112 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/CudoVentures/terraform-provider-cudo/internal/compute/vm"
+	"github.com/hashicorp/terraform-plugin-framework/datasource"
+	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+// Ensure provider defined types fully satisfy framework interfaces.
+var _ datasource.DataSource = &StorageDiskDataSource{}
+
+func NewStorageDiskDataSource() datasource.DataSource {
+	return &StorageDiskDataSource{}
+}
+
+// SecurityGroupsDataSource defines the data source implementation.
+type StorageDiskDataSource struct {
+	client *CudoClientData
+}
+
+// SecurityGroupDataSourceModel describes the resource data model.
+type StorageDiskDataSourceModel struct {
+	ID           types.String `tfsdk:"id"`
+	ProjectID    types.String `tfsdk:"project_id"`
+	DataCenterID types.String `tfsdk:"data_center_id"`
+	SizeGib      types.Int64  `tfsdk:"size_gib"`
+}
+
+func (d *StorageDiskDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
+	resp.TypeName = "cudo_storage_disk"
+}
+
+func (d *StorageDiskDataSource) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) {
+	resp.Schema = schema.Schema{
+		MarkdownDescription: "Disk data source",
+		Description:         "Gets a Disk",
+		Attributes: map[string]schema.Attribute{
+			"id": schema.StringAttribute{
+				Description: "Storage disk ID.",
+				Required:    true,
+			},
+			"project_id": schema.StringAttribute{
+				Description: "The unique identifier of the project the disk is in.",
+				Optional:    true,
+			},
+			"data_center_id": schema.StringAttribute{
+				Description: "The unique identifier of the datacenter where the disk is located.",
+				Computed:    true,
+			},
+			"size_gib": schema.Int64Attribute{
+				Description: "Size of the storage disk in GiB",
+				Computed:    true,
+			},
+		},
+	}
+}
+
+func (d *StorageDiskDataSource) Configure(ctx context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
+	// Prevent panic if the provider has not been configured.
+	if req.ProviderData == nil {
+		return
+	}
+
+	client, ok := req.ProviderData.(*CudoClientData)
+	if !ok {
+		resp.Diagnostics.AddError(
+			"Unexpected Data Source Configure Type",
+			fmt.Sprintf("Expected *CudoClient, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+		)
+
+		return
+	}
+
+	d.client = client
+}
+
+func (d *StorageDiskDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
+	var state StorageDiskDataSourceModel
+
+	resp.Diagnostics.Append(req.Config.Get(ctx, &state)...)
+
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	projectId := d.client.DefaultProjectID
+	if !state.ProjectID.IsNull() {
+		projectId = state.ProjectID.ValueString()
+	}
+
+	res, err := d.client.VMClient.GetDisk(ctx, &vm.GetDiskRequest{
+		ProjectId: projectId,
+		Id:        state.ID.ValueString(),
+	})
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Unable to read storage disks",
+			err.Error(),
+		)
+		return
+	}
+
+	state.DataCenterID = types.StringValue(res.Disk.DataCenterId)
+	state.SizeGib = types.Int64Value(int64(res.Disk.SizeGib))
+
+	// Save data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
+}
diff --git a/internal/provider/storage_disk_data_source_test.go b/internal/provider/storage_disk_data_source_test.go
new file mode 100644
index 0000000..0f52c3f
--- /dev/null
+++ b/internal/provider/storage_disk_data_source_test.go
@@ -0,0 +1,71 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/CudoVentures/terraform-provider-cudo/internal/compute/vm"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+)
+
+func TestAcc_StorageDiskDataSource(t *testing.T) {
+	var cancel context.CancelFunc
+	ctx := context.Background()
+	deadline, ok := t.Deadline()
+	if ok {
+		ctx, cancel = context.WithDeadline(ctx, deadline)
+		defer cancel()
+	}
+	name := "storage-disk-data-source" + testRunID
+
+	resourcesConfig := fmt.Sprintf(`
+resource "cudo_storage_disk" "disk_ds" {
+	data_center_id = "black-mesa"
+	id = "%s"
+	size_gib = 15
+}`, name)
+
+	testAccStorageDiskDataSourceConfig := fmt.Sprintf(`
+data "cudo_storage_disk" "storage_disk_datasource" {
+	id = "%s"
+}`, name)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		CheckDestroy: func(state *terraform.State) error {
+			cl, _ := getClients(t)
+
+			ins, err := cl.GetDisk(ctx, &vm.GetDiskRequest{
+				Id:        name,
+				ProjectId: projectID,
+			})
+
+			if err == nil && ins.Disk.DiskState != vm.Disk_DISK_STATE_DELETE {
+				res, err := cl.DeleteStorageDisk(ctx, &vm.DeleteStorageDiskRequest{
+					Id:        name,
+					ProjectId: projectID,
+				})
+				t.Logf("(%s) %#v: %v", ins.Disk.DiskState, res, err)
+
+				return fmt.Errorf("disk resource not destroyed %s , %s", ins.Disk.Id, ins.Disk.DiskState)
+			}
+			return nil
+		},
+
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: getProviderConfig() + resourcesConfig,
+			},
+			{
+				Config: getProviderConfig() + resourcesConfig + testAccStorageDiskDataSourceConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("data.cudo_storage_disk.storage_disk_datasource", "id", name),
+					resource.TestCheckResourceAttr("data.cudo_storage_disk.storage_disk_datasource", "size_gib", "15"),
+				),
+			},
+		},
+	})
+}
diff --git a/internal/provider/storage_disk_resource.go b/internal/provider/storage_disk_resource.go
new file mode 100644
index 0000000..298e879
--- /dev/null
+++ b/internal/provider/storage_disk_resource.go
@@ -0,0 +1,342 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"regexp"
+	"time"
+
+	"github.com/CudoVentures/terraform-provider-cudo/internal/compute/vm"
+	"github.com/CudoVentures/terraform-provider-cudo/internal/helper"
+	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/hashicorp/terraform-plugin-log/tflog"
+	"google.golang.org/grpc/codes"
+)
+
+// Ensure provider defined types fully satisfy framework interfaces.
+var _ resource.Resource = &StorageDiskResource{}
+var _ resource.ResourceWithImportState = &StorageDiskResource{}
+
+func NewStorageDiskResource() resource.Resource {
+	return &StorageDiskResource{}
+}
+
+// DiskResource defines the resource implementation.
+type StorageDiskResource struct {
+	client *CudoClientData
+}
+
+// SecurityGroupResourceModel describes the resource data model.
+type StorageDiskResourceModel struct {
+	ProjectID    types.String `tfsdk:"project_id"`
+	DataCenterID types.String `tfsdk:"data_center_id"`
+	Id           types.String `tfsdk:"id"`
+	SizeGib      types.Int64  `tfsdk:"size_gib"`
+}
+
+func (r *StorageDiskResource) Metadata(ctx context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
+	resp.TypeName = "cudo_storage_disk"
+}
+
+func (r *StorageDiskResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	resp.Schema = schema.Schema{
+		// This description is used by the documentation generator and the language server.
+		MarkdownDescription: "Storage disk resource",
+		Attributes: map[string]schema.Attribute{
+			"data_center_id": schema.StringAttribute{
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				MarkdownDescription: "The unique identifier of the datacenter where the disk is located.",
+				Required:            true,
+				Validators: []validator.String{stringvalidator.RegexMatches(
+					regexp.MustCompile("^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$"), "must be a valid resource id")},
+			},
+			"project_id": schema.StringAttribute{
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				MarkdownDescription: "The project the storage disk is in.",
+				Optional:            true,
+			},
+			"id": schema.StringAttribute{
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				Description: "The unique identifier of the storage disk",
+				Required:    true,
+				Validators: []validator.String{stringvalidator.RegexMatches(
+					regexp.MustCompile("^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$"), "must be a valid resource id")},
+			},
+			"size_gib": schema.Int64Attribute{
+				PlanModifiers: []planmodifier.Int64{
+					int64planmodifier.RequiresReplace(),
+				},
+				Description: "Size of the storage disk in GiB",
+				Required:    true,
+			},
+		},
+	}
+}
+
+func (r *StorageDiskResource) Configure(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
+	// Prevent panic if the provider has not been configured.
+	if req.ProviderData == nil {
+		return
+	}
+
+	client, ok := req.ProviderData.(*CudoClientData)
+	if !ok {
+		resp.Diagnostics.AddError(
+			"Unexpected Resource Configure Type",
+			fmt.Sprintf("Expected *CudoClientData got: %T. Please report this issue to the provider developers.", req.ProviderData),
+		)
+
+		return
+	}
+
+	r.client = client
+}
+
+func (r *StorageDiskResource) waitForDiskDelete(ctx context.Context, diskID, projectID string) error {
+	refreshFunc := func() (interface{}, string, error) {
+		res, err := r.client.VMClient.GetDisk(ctx, &vm.GetDiskRequest{
+			Id:        diskID,
+			ProjectId: projectID,
+		})
+		if err != nil {
+			// if not found resource has been deleted
+			if ok := helper.IsErrCode(err, codes.NotFound); ok {
+				// tflog.Debug(ctx, fmt.Sprintf("VM %s in project %s not found: ", vmID, projectID))
+				return res, "done", nil
+			}
+			return nil, "", err
+		}
+
+		// tflog.Trace(ctx, fmt.Sprintf("pending VM %s in project %s state: %s", vmID, projectID, res.Payload.VM.ShortState))
+		return res, res.Disk.DiskState.String(), nil
+	}
+
+	tflog.Debug(ctx, fmt.Sprintf("waiting for Disk %s in project %s ", diskID, projectID))
+
+	pendingStates := []string{
+		vm.Disk_DISK_STATE_INIT.String(),
+		vm.Disk_DISK_STATE_READY.String(),
+		vm.Disk_DISK_STATE_USED.String(),
+		vm.Disk_DISK_STATE_DISABLED.String(),
+		vm.Disk_DISK_STATE_LOCKED.String(),
+		vm.Disk_DISK_STATE_ERROR.String(),
+		vm.Disk_DISK_STATE_CLONE.String(),
+		vm.Disk_DISK_STATE_DELETE.String(),
+	}
+	stateConf := &helper.StateChangeConf{
+		Pending:      pendingStates,
+		Target:       []string{"done"},
+		Refresh:      refreshFunc,
+		Timeout:      20 * time.Minute,
+		Delay:        1 * time.Second,
+		MinTimeout:   3 * time.Second,
+		PollInterval: 5 * time.Second,
+	}
+
+	_, err := stateConf.WaitForState(ctx)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *StorageDiskResource) waitForDiskCreate(ctx context.Context, diskID, projectID string) error {
+	refreshFunc := func() (interface{}, string, error) {
+		res, err := r.client.VMClient.GetDisk(ctx, &vm.GetDiskRequest{
+			ProjectId: projectID,
+			Id:        diskID,
+		})
+		if err != nil {
+			// if not found assume resource is initializing
+			if ok := helper.IsErrCode(err, codes.NotFound); ok {
+				// tflog.Debug(ctx, fmt.Sprintf("VM %s in project %s not found: ", vmID, projectID))
+				return res, vm.Disk_DISK_STATE_INIT.String(), nil
+			}
+			return nil, "", err
+		}
+
+		// tflog.Trace(ctx, fmt.Sprintf("pending VM %s in project %s state: %s", vmID, projectID, res.Payload.VM.ShortState))
+		return res, res.Disk.DiskState.String(), nil
+	}
+
+	tflog.Debug(ctx, fmt.Sprintf("waiting for Disk %s in project %s ", diskID, projectID))
+
+	pendingStates := []string{
+		vm.Disk_DISK_STATE_INIT.String(),
+		vm.Disk_DISK_STATE_USED.String(),
+		vm.Disk_DISK_STATE_DISABLED.String(),
+		vm.Disk_DISK_STATE_LOCKED.String(),
+		vm.Disk_DISK_STATE_ERROR.String(),
+		vm.Disk_DISK_STATE_CLONE.String(),
+		vm.Disk_DISK_STATE_DELETE.String(),
+	}
+
+	stateConf := &helper.StateChangeConf{
+		Pending:      pendingStates,
+		Target:       []string{vm.Disk_DISK_STATE_READY.String()},
+		Refresh:      refreshFunc,
+		Timeout:      20 * time.Minute,
+		Delay:        1 * time.Second,
+		MinTimeout:   3 * time.Second,
+		PollInterval: 5 * time.Second,
+	}
+
+	_, err := stateConf.WaitForState(ctx)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *StorageDiskResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	var state StorageDiskResourceModel
+
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	projectID := r.client.DefaultProjectID
+	if !state.ProjectID.IsNull() {
+		projectID = state.ProjectID.ValueString()
+	}
+
+	_, err := r.client.VMClient.CreateStorageDisk(ctx, &vm.CreateStorageDiskRequest{
+		DataCenterId: state.DataCenterID.ValueString(),
+		ProjectId:    projectID,
+		Disk: &vm.Disk{
+			Id:      string(state.Id.ValueString()),
+			SizeGib: int32(state.SizeGib.ValueInt64()),
+		},
+	})
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Unable to create storage disk resource",
+			err.Error(),
+		)
+		return
+	}
+
+	if err := r.waitForDiskCreate(ctx, state.Id.ValueString(), projectID); err != nil {
+		resp.Diagnostics.AddError(
+			"Unable to wait for Disk resource to be created",
+			err.Error(),
+		)
+		return
+	}
+
+	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
+}
+
+func (r *StorageDiskResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	var state *StorageDiskResourceModel
+
+	// Read Terraform prior state data into the model
+	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	projectId := r.client.DefaultProjectID
+	if !state.ProjectID.IsNull() {
+		projectId = state.ProjectID.ValueString()
+	}
+
+	res, err := r.client.VMClient.GetDisk(ctx, &vm.GetDiskRequest{
+		Id:        state.Id.ValueString(),
+		ProjectId: projectId,
+	})
+	if err != nil {
+		if helper.IsErrCode(err, codes.NotFound) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
+		resp.Diagnostics.AddError(
+			"Unable to read disk resource",
+			err.Error(),
+		)
+		return
+	}
+
+	state.DataCenterID = types.StringValue(res.Disk.DataCenterId)
+	state.Id = types.StringValue(res.Disk.Id)
+	state.SizeGib = types.Int64Value(int64(res.Disk.SizeGib))
+
+	// Save updated data into Terraform state
+	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
+}
+
+func (r *StorageDiskResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	var plan StorageDiskResourceModel
+
+	// Read Terraform plan data into the model
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...)
+	if resp.Diagnostics.HasError() {
+		resp.Diagnostics.AddError(
+			"Error getting storage disk plan",
+			"Error getting storage disk plan",
+		)
+		return
+	}
+
+	// Read Terraform state data into the model
+	var state StorageDiskResourceModel
+	resp.Diagnostics.Append(req.Plan.Get(ctx, &state)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+}
+
+func (r *StorageDiskResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
+	var state *StorageDiskResourceModel
+	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
+
+	projectId := r.client.DefaultProjectID
+	if !state.ProjectID.IsNull() {
+		projectId = state.ProjectID.ValueString()
+	}
+
+	_, err := r.client.VMClient.DeleteStorageDisk(ctx, &vm.DeleteStorageDiskRequest{
+		ProjectId: projectId,
+		Id:        state.Id.ValueString(),
+	})
+
+	if err != nil {
+		resp.Diagnostics.AddError(
+			"Unable to delete storage disk",
+			err.Error(),
+		)
+		return
+	}
+
+	if err := r.waitForDiskDelete(ctx, state.Id.ValueString(), projectId); err != nil {
+		resp.Diagnostics.AddError(
+			"Unable to wait for Disk resource to be deleted",
+			err.Error(),
+		)
+		return
+	}
+
+	tflog.Trace(ctx, "deleted storage disk")
+}
+
+func (r *StorageDiskResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
+	resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
+}
diff --git a/internal/provider/storage_disk_resource_test.go b/internal/provider/storage_disk_resource_test.go
new file mode 100644
index 0000000..6542e19
--- /dev/null
+++ b/internal/provider/storage_disk_resource_test.go
@@ -0,0 +1,63 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/CudoVentures/terraform-provider-cudo/internal/compute/vm"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+)
+
+func TestAcc_StorageDiskResource(t *testing.T) {
+	var cancel context.CancelFunc
+	ctx := context.Background()
+	deadline, ok := t.Deadline()
+	if ok {
+		ctx, cancel = context.WithDeadline(ctx, deadline)
+		defer cancel()
+	}
+	name := "disk-resource-" + testRunID
+
+	diskConf := fmt.Sprintf(`
+resource "cudo_storage_disk" "storage_disk_resource" {
+	data_center_id = "black-mesa"
+	id = "%s"
+	size_gib = 15
+}`, name)
+
+	resource.ParallelTest(t, resource.TestCase{
+		CheckDestroy: func(state *terraform.State) error {
+			cl, _ := getClients(t)
+
+			ins, err := cl.GetDisk(ctx, &vm.GetDiskRequest{
+				Id:        name,
+				ProjectId: projectID,
+			})
+			if err == nil && ins.Disk.DiskState != vm.Disk_DISK_STATE_DELETE {
+				res, err := cl.DeleteStorageDisk(ctx, &vm.DeleteStorageDiskRequest{
+					Id:        name,
+					ProjectId: projectID,
+				})
+				t.Logf("(%s) %#v: %v", ins.Disk.DiskState, res, err)
+
+				return fmt.Errorf("disk resource not destroyed %s , %s", ins.Disk.Id, ins.Disk.DiskState)
+			}
+			return nil
+		},
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			// Create and Read testing
+			{
+				Config: getProviderConfig() + diskConf,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("cudo_storage_disk.storage_disk_resource", "data_center_id", "black-mesa"),
+					resource.TestCheckResourceAttr("cudo_storage_disk.storage_disk_resource", "size_gib", "15"),
+					resource.TestCheckResourceAttr("cudo_storage_disk.storage_disk_resource", "id", name),
+				),
+			},
+		},
+	})
+}
diff --git a/internal/provider/vm_resource.go b/internal/provider/vm_resource.go
index 9a697c2..dc30777 100644
--- a/internal/provider/vm_resource.go
+++ b/internal/provider/vm_resource.go
@@ -227,6 +227,22 @@ func (r *VMResource) Schema(ctx context.Context, req resource.SchemaRequest, res
 				MarkdownDescription: "A script to run when VM boots",
 				Optional:            true,
 			},
+			"storage_disks": schema.SetNestedAttribute{
+				MarkdownDescription: "Specification for storage disks",
+				Optional:            true,
+				NestedObject: schema.NestedAttributeObject{
+					Attributes: map[string]schema.Attribute{
+						"disk_id": schema.StringAttribute{
+							PlanModifiers: []planmodifier.String{
+								stringplanmodifier.RequiresReplace(),
+							},
+							MarkdownDescription: "ID of storage disk to attach to vm",
+							Required:            true,
+							Validators:          []validator.String{stringvalidator.RegexMatches(regexp.MustCompile("^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$"), "must be a valid resource id")},
+						},
+					},
+				},
+			},
 			"vcpus": schema.Int64Attribute{
 				PlanModifiers: []planmodifier.Int64{
 					int64planmodifier.RequiresReplace(),
@@ -246,27 +262,28 @@ type VMResource struct {
 
 // VMResourceModel describes the resource data model.
 type VMResourceModel struct {
-	BootDisk          *VMBootDiskResourceModel `tfsdk:"boot_disk"`
-	DataCenterID      types.String             `tfsdk:"data_center_id"`
-	CPUModel          types.String             `tfsdk:"cpu_model"`
-	GPUs              types.Int64              `tfsdk:"gpus"`
-	GPUModel          types.String             `tfsdk:"gpu_model"`
-	ID                types.String             `tfsdk:"id"`
-	MachineType       types.String             `tfsdk:"machine_type"`
-	MemoryGib         types.Int64              `tfsdk:"memory_gib"`
-	Password          types.String             `tfsdk:"password"`
-	PriceHr           types.String             `tfsdk:"price_hr"`
-	ProjectID         types.String             `tfsdk:"project_id"`
-	SSHKeys           []types.String           `tfsdk:"ssh_keys"`
-	SSHKeySource      types.String             `tfsdk:"ssh_key_source"`
-	StartScript       types.String             `tfsdk:"start_script"`
-	VCPUs             types.Int64              `tfsdk:"vcpus"`
-	Networks          []*VMNICResourceModel    `tfsdk:"networks"`
-	InternalIPAddress types.String             `tfsdk:"internal_ip_address"`
-	ExternalIPAddress types.String             `tfsdk:"external_ip_address"`
-	RenewableEnergy   types.Bool               `tfsdk:"renewable_energy"`
-	SecurityGroupIDs  types.Set                `tfsdk:"security_group_ids"`
-	Metadata          types.Map                `tfsdk:"metadata"`
+	BootDisk          *VMBootDiskResourceModel      `tfsdk:"boot_disk"`
+	DataCenterID      types.String                  `tfsdk:"data_center_id"`
+	CPUModel          types.String                  `tfsdk:"cpu_model"`
+	GPUs              types.Int64                   `tfsdk:"gpus"`
+	GPUModel          types.String                  `tfsdk:"gpu_model"`
+	ID                types.String                  `tfsdk:"id"`
+	MachineType       types.String                  `tfsdk:"machine_type"`
+	MemoryGib         types.Int64                   `tfsdk:"memory_gib"`
+	Password          types.String                  `tfsdk:"password"`
+	PriceHr           types.String                  `tfsdk:"price_hr"`
+	ProjectID         types.String                  `tfsdk:"project_id"`
+	SSHKeys           []types.String                `tfsdk:"ssh_keys"`
+	SSHKeySource      types.String                  `tfsdk:"ssh_key_source"`
+	StartScript       types.String                  `tfsdk:"start_script"`
+	StorageDisks      []*VMStorageDiskResourceModel `tfsdk:"storage_disks"`
+	VCPUs             types.Int64                   `tfsdk:"vcpus"`
+	Networks          []*VMNICResourceModel         `tfsdk:"networks"`
+	InternalIPAddress types.String                  `tfsdk:"internal_ip_address"`
+	ExternalIPAddress types.String                  `tfsdk:"external_ip_address"`
+	RenewableEnergy   types.Bool                    `tfsdk:"renewable_energy"`
+	SecurityGroupIDs  types.Set                     `tfsdk:"security_group_ids"`
+	Metadata          types.Map                     `tfsdk:"metadata"`
 }
 
 type VMBootDiskResourceModel struct {
@@ -282,6 +299,10 @@ type VMNICResourceModel struct {
 	SecurityGroupIDs  types.Set    `tfsdk:"security_group_ids"`
 }
 
+type VMStorageDiskResourceModel struct {
+	DiskID types.String `tfsdk:"disk_id"`
+}
+
 func (r *VMResource) Configure(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
 	// Prevent panic if the provider has not been configured.
 	if req.ProviderData == nil {
@@ -359,6 +380,11 @@ func (r *VMResource) Create(ctx context.Context, req resource.CreateRequest, res
 		return
 	}
 
+	storageDiskIds := make([]string, len(state.StorageDisks))
+	for i, diskResource := range state.StorageDisks {
+		storageDiskIds[i] = diskResource.DiskID.ValueString()
+	}
+
 	metadataMap := make(map[string]string)
 	diag := state.Metadata.ElementsAs(ctx, &metadataMap, false)
 	if diag.HasError() {
@@ -382,6 +408,7 @@ func (r *VMResource) Create(ctx context.Context, req resource.CreateRequest, res
 		SshKeySource:     sshKeySource,
 		CustomSshKeys:    customKeys,
 		StartScript:      state.StartScript.ValueString(),
+		StorageDiskIds:   storageDiskIds,
 		Metadata:         metadataMap,
 	}
 
@@ -402,7 +429,11 @@ func (r *VMResource) Create(ctx context.Context, req resource.CreateRequest, res
 		)
 		return
 	}
-	appendVmState(vm.VM, &state)
+
+	// if the vm is created and returned update the state.
+	if vm != nil && vm.VM != nil {
+		appendVmState(vm.VM, &state)
+	}
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 }
 
@@ -603,6 +634,13 @@ func appendVmState(vm *vm.VM, state *VMResourceModel) {
 		nic.ExternalIPAddress = types.StringValue(vm.Nics[i].ExternalIpAddress)
 		nic.InternalIPAddress = types.StringValue(vm.Nics[i].InternalIpAddress)
 	}
+	var storageDisks []*VMStorageDiskResourceModel
+	for _, vmDisk := range vm.StorageDisks {
+		storageDisks = append(storageDisks, &VMStorageDiskResourceModel{
+			DiskID: types.StringValue(vmDisk.Id),
+		})
+	}
+	state.StorageDisks = storageDisks
 	state.GPUModel = types.StringValue(vm.GpuModel)
 	state.ID = types.StringValue(vm.Id)
 	state.InternalIPAddress = types.StringValue(vm.InternalIpAddress)
diff --git a/internal/provider/vm_resource_test.go b/internal/provider/vm_resource_test.go
index 691df80..a77c239 100644
--- a/internal/provider/vm_resource_test.go
+++ b/internal/provider/vm_resource_test.go
@@ -266,3 +266,105 @@ resource "cudo_vm" "vm-oob-delete" {
 		},
 	})
 }
+
+func TestAcc_VMStorageDiskResource(t *testing.T) {
+	var cancel context.CancelFunc
+	ctx := context.Background()
+	deadline, ok := t.Deadline()
+	if ok {
+		ctx, cancel = context.WithDeadline(ctx, deadline)
+		defer cancel()
+	}
+	name := "vm-storage-disk-resource-" + testRunID
+	// important that the disks are in ascending order as that is how the api returns them
+	diskName1 := "vm-resource-disk1" + testRunID
+	diskName2 := "vm-resource-disk2" + testRunID
+
+	diskConfig := fmt.Sprintf(`
+resource "cudo_storage_disk" "vm_resource_disk1" {
+	data_center_id = "black-mesa"
+	id = "%s"
+	size_gib = 10
+}
+
+resource "cudo_storage_disk" "vm_resource_disk2" {
+	data_center_id = "black-mesa"
+	id = "%s"
+	size_gib = 20
+}`, diskName1, diskName2)
+
+	vmConfig := fmt.Sprintf(`
+resource "cudo_vm" "vm_disk_resource" {
+   depends_on =  [cudo_storage_disk.vm_resource_disk1, cudo_storage_disk.vm_resource_disk2]
+   machine_type       = "standard"
+   data_center_id     = "black-mesa"
+   vcpus              = 1
+   boot_disk = {
+     image_id = "alpine-linux-317"
+     size_gib = 1
+   }
+   memory_gib         = 2
+   id                = "%s"
+   networks = [
+    {
+      network_id         = "tf-test"
+    }
+  ]
+  storage_disks = [ 
+        {
+            disk_id = "%s"
+        },
+        {
+            disk_id = "%s"
+        }
+    ]
+ }`, name, diskName1, diskName2)
+
+	resource.ParallelTest(t, resource.TestCase{
+		CheckDestroy: func(state *terraform.State) error {
+			cl, _ := getClients(t)
+
+			getParams := &vm.GetVMRequest{
+				Id:        name,
+				ProjectId: projectID,
+			}
+
+			getRes, err := cl.GetVM(ctx, getParams)
+			if err == nil && getRes.VM.ShortState != "epil" {
+				terminateParams := &vm.TerminateVMRequest{
+					Id:        name,
+					ProjectId: projectID,
+				}
+				res, err := cl.TerminateVM(ctx, terminateParams)
+				t.Logf("(%s) %#v: %v", getRes.VM.ShortState, res, err)
+
+				return fmt.Errorf("vm resource not destroyed %s , %s", getRes.VM.Id, getRes.VM.ShortState)
+			}
+			return nil
+		},
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			// Create and Read testing
+			{
+				Config: getProviderConfig() + diskConfig + vmConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "boot_disk.image_id", "alpine-linux-317"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "boot_disk.size_gib", "1"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "machine_type", "standard"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "cpu_model", "Haswell-noTSX-IBRS"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "data_center_id", "black-mesa"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "gpu_model", ""),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "memory_gib", "2"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "storage_disks.0.disk_id", diskName1),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "storage_disks.1.disk_id", diskName2),
+					resource.TestCheckResourceAttrSet("cudo_vm.vm_disk_resource", "price_hr"),
+					resource.TestCheckResourceAttrSet("cudo_vm.vm_disk_resource", "internal_ip_address"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "renewable_energy", "true"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "vcpus", "1"),
+					resource.TestCheckResourceAttr("cudo_vm.vm_disk_resource", "id", name),
+				),
+			},
+		},
+	})
+}