diff --git a/docker/resource_docker_volume.go b/docker/resource_docker_volume.go
index 388ff7f3..a4006edc 100644
--- a/docker/resource_docker_volume.go
+++ b/docker/resource_docker_volume.go
@@ -3,13 +3,14 @@ package docker
 import (
 	"context"
 	"fmt"
+	"log"
+	"strings"
+	"time"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"log"
-	"strings"
-	"time"
 )
 
 func resourceDockerVolume() *schema.Resource {
@@ -18,6 +19,55 @@ func resourceDockerVolume() *schema.Resource {
 		Read:   resourceDockerVolumeRead,
 		Delete: resourceDockerVolumeDelete,
 
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+			"labels": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				ForceNew: true,
+				Elem:     labelSchema,
+			},
+			"driver": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+			"driver_opts": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				ForceNew: true,
+			},
+			"mountpoint": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+		SchemaVersion: 1,
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Version: 0,
+				Type:    resourceDockerVolumeV0().CoreConfigSchema().ImpliedType(),
+				Upgrade: func(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+					labelMap := rawState["labels"].(map[string]interface{})
+					rawState["labels"] = upgradeLabelMapFromV0ToV1(labelMap)
+
+					return rawState, nil
+				},
+			},
+		},
+	}
+}
+
+func resourceDockerVolumeV0() *schema.Resource {
+	return &schema.Resource{
+		//This is only used for state migration, so the CRUD
+		//callbacks are no longer relevant
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:     schema.TypeString,
@@ -59,7 +109,7 @@ func resourceDockerVolumeCreate(d *schema.ResourceData, meta interface{}) error
 		createOpts.Name = v.(string)
 	}
 	if v, ok := d.GetOk("labels"); ok {
-		createOpts.Labels = mapTypeMapValsToString(v.(map[string]interface{}))
+		createOpts.Labels = labelSetToMap(v.(*schema.Set))
 	}
 	if v, ok := d.GetOk("driver"); ok {
 		createOpts.Driver = v.(string)
diff --git a/docker/resource_docker_volume_test.go b/docker/resource_docker_volume_test.go
index e0b5f938..5898332c 100644
--- a/docker/resource_docker_volume_test.go
+++ b/docker/resource_docker_volume_test.go
@@ -3,10 +3,11 @@ package docker
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/docker/docker/api/types"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-	"testing"
 )
 
 func TestAccDockerVolume_basic(t *testing.T) {
@@ -69,8 +70,12 @@ func TestAccDockerVolume_labels(t *testing.T) {
 				Config: testAccDockerVolumeLabelsConfig,
 				Check: resource.ComposeTestCheckFunc(
 					checkDockerVolume("docker_volume.foo", &v),
-					testAccVolumeLabel(&v, "com.docker.compose.project", "test"),
-					testAccVolumeLabel(&v, "com.docker.compose.volume", "foo"),
+					testCheckLabelMap("docker_volume.foo", "labels",
+						map[string]string{
+							"com.docker.compose.project": "test",
+							"com.docker.compose.volume":  "foo",
+						},
+					),
 				),
 			},
 		},
@@ -90,8 +95,12 @@ const testAccDockerVolumeLabelsConfig = `
 resource "docker_volume" "foo" {
   name = "test_foo"
   labels = {
-    "com.docker.compose.project" = "test"
-    "com.docker.compose.volume"  = "foo"
+    label = "com.docker.compose.project"
+    value = "test"
+  }
+  labels = {
+    label = "com.docker.compose.volume"
+    value = "foo"
   }
 }
 `