diff --git a/.gitignore b/.gitignore
index d91e5c6a4..c9e1df1b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ website/node_modules
 *.iml
 *.test
 .vscode
+*.orig
 
 website/vendor
 
diff --git a/vault/import_mount_test.go b/vault/import_mount_test.go
index c4b1d38bd..bf7f34cac 100644
--- a/vault/import_mount_test.go
+++ b/vault/import_mount_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestAccMount_importBasic(t *testing.T) {
 	path := "test-" + acctest.RandString(10)
-	cfg := mountConfig{
+	cfg := testMountConfig{
 		path:      path,
 		mountType: "kv",
 		version:   "1",
diff --git a/vault/resource_azure_secret_backend_role.go b/vault/resource_azure_secret_backend_role.go
index 2f85e1ff1..4b385cfaa 100644
--- a/vault/resource_azure_secret_backend_role.go
+++ b/vault/resource_azure_secret_backend_role.go
@@ -42,7 +42,6 @@ func azureSecretBackendRoleResource() *schema.Resource {
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Human-friendly description of the mount for the backend.",
 			},
 			"azure_roles": {
diff --git a/vault/resource_jwt_auth_backend.go b/vault/resource_jwt_auth_backend.go
index 707695bff..2038fe775 100644
--- a/vault/resource_jwt_auth_backend.go
+++ b/vault/resource_jwt_auth_backend.go
@@ -48,7 +48,6 @@ func jwtAuthBackendResource() *schema.Resource {
 			"description": {
 				Type:        schema.TypeString,
 				Required:    false,
-				ForceNew:    true,
 				Optional:    true,
 				Description: "The description of the auth backend",
 			},
diff --git a/vault/resource_kubernetes_secret_backend_test.go b/vault/resource_kubernetes_secret_backend_test.go
index 2e083b1dc..9c5eb5876 100644
--- a/vault/resource_kubernetes_secret_backend_test.go
+++ b/vault/resource_kubernetes_secret_backend_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
 	"github.com/hashicorp/terraform-provider-vault/internal/consts"
 	"github.com/hashicorp/terraform-provider-vault/testutil"
 )
diff --git a/vault/resource_mount.go b/vault/resource_mount.go
index baac00b62..4ef9642c4 100644
--- a/vault/resource_mount.go
+++ b/vault/resource_mount.go
@@ -32,7 +32,6 @@ func getMountSchema(excludes ...string) schemaMap {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Required:    false,
-			ForceNew:    false,
 			Description: "Human-friendly description of the mount",
 		},
 		"default_lease_ttl_seconds": {
diff --git a/vault/resource_mount_test.go b/vault/resource_mount_test.go
index e42fc21ac..ec6267095 100644
--- a/vault/resource_mount_test.go
+++ b/vault/resource_mount_test.go
@@ -15,11 +15,12 @@ import (
 	"github.com/hashicorp/terraform-provider-vault/testutil"
 )
 
-type mountConfig struct {
-	path      string
-	mountType string
-	version   string
-	seal_wrap bool
+type testMountConfig struct {
+	path        string
+	mountType   string
+	version     string
+	sealWrap    bool
+	description string
 }
 
 func TestZeroTTLDoesNotCauseUpdate(t *testing.T) {
@@ -51,10 +52,18 @@ func TestZeroTTLDoesNotCauseUpdate(t *testing.T) {
 
 func TestResourceMount(t *testing.T) {
 	path := "example-" + acctest.RandString(10)
-	cfg := mountConfig{
-		path:      path,
-		mountType: "kv",
-		version:   "1",
+	cfg := testMountConfig{
+		path:        path,
+		mountType:   "kv",
+		version:     "1",
+		description: "initial",
+	}
+
+	cfg2 := testMountConfig{
+		path:        path,
+		mountType:   "kv",
+		version:     "1",
+		description: "updated",
 	}
 	resource.Test(t, resource.TestCase{
 		Providers: testProviders,
@@ -64,6 +73,10 @@ func TestResourceMount(t *testing.T) {
 				Config: testResourceMount_initialConfig(cfg),
 				Check:  testResourceMount_initialCheck(cfg),
 			},
+			{
+				Config: testResourceMount_initialConfig(cfg2),
+				Check:  testResourceMount_initialCheck(cfg2),
+			},
 			{
 				Config: testResourceMount_updateConfig,
 				Check:  testResourceMount_updateCheck,
@@ -165,6 +178,13 @@ func TestResourceMount_KVV2(t *testing.T) {
 				default_lease_ttl_seconds = 3600
 				max_lease_ttl_seconds = 36000
 			}`, path)
+
+	config := testMountConfig{
+		path:        path,
+		mountType:   "kv",
+		version:     "2",
+		description: "Example mount for testing",
+	}
 	resource.Test(t, resource.TestCase{
 		Providers: testProviders,
 		PreCheck:  func() { testutil.TestAccPreCheck(t) },
@@ -173,11 +193,7 @@ func TestResourceMount_KVV2(t *testing.T) {
 				Config: kvv2Cfg,
 
 				// Vault will store this and report it back as "kv", version 2
-				Check: testResourceMount_initialCheck(mountConfig{
-					path:      path,
-					mountType: "kv",
-					version:   "2",
-				}),
+				Check: testResourceMount_initialCheck(config),
 			},
 			{
 				PlanOnly: true,
@@ -217,22 +233,22 @@ func TestResourceMount_ExternalEntropyAccess(t *testing.T) {
 	})
 }
 
-func testResourceMount_initialConfig(cfg mountConfig) string {
+func testResourceMount_initialConfig(cfg testMountConfig) string {
 	return fmt.Sprintf(`
 resource "vault_mount" "test" {
-	path = "%s"
-	type = "%s"
-	description = "Example mount for testing"
-	default_lease_ttl_seconds = 3600
-	max_lease_ttl_seconds = 36000
-	options = {
-		version = "1"
-	}
+  path                      = "%s"
+  type                      = "%s"
+  description               = "%s"
+  default_lease_ttl_seconds = 3600
+  max_lease_ttl_seconds     = 36000
+  options = {
+    version = "1"
+  }
 }
-`, cfg.path, cfg.mountType)
+`, cfg.path, cfg.mountType, cfg.description)
 }
 
-func testResourceMount_initialCheck(cfg mountConfig) resource.TestCheckFunc {
+func testResourceMount_initialCheck(cfg testMountConfig) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		resourceState := s.Modules[0].Resources["vault_mount.test"]
 		if resourceState == nil {
@@ -259,7 +275,7 @@ func testResourceMount_initialCheck(cfg mountConfig) resource.TestCheckFunc {
 			return fmt.Errorf("error reading back mount %q: %s", path, err)
 		}
 
-		if wanted := "Example mount for testing"; mount.Description != wanted {
+		if wanted := cfg.description; mount.Description != wanted {
 			return fmt.Errorf("description is %v; wanted %v", mount.Description, wanted)
 		}
 
@@ -485,19 +501,17 @@ func testResourceMount_InitialCheckSealWrap(expectedPath string) resource.TestCh
 }
 
 var testResourceMount_UpdateConfigSealWrap = `
-
 resource "vault_mount" "test" {
-	path = "remountingExample"
-	type = "kv"
-	description = "Example mount for testing"
-	default_lease_ttl_seconds = 7200
-	max_lease_ttl_seconds = 72000
-	options = {
-		version = "1"
-	}
-	seal_wrap = false
+  path                      = "remountingExample"
+  type                      = "kv"
+  description               = "Example mount for testing"
+  default_lease_ttl_seconds = 7200
+  max_lease_ttl_seconds     = 72000
+  options = {
+    version = "1"
+  }
+  seal_wrap = false
 }
-
 `
 
 func testResourceMount_UpdateCheckSealWrap(s *terraform.State) error {
diff --git a/vault/resource_okta_auth_backend.go b/vault/resource_okta_auth_backend.go
index e0b767731..c672c8343 100644
--- a/vault/resource_okta_auth_backend.go
+++ b/vault/resource_okta_auth_backend.go
@@ -48,7 +48,6 @@ func oktaAuthBackendResource() *schema.Resource {
 			"description": {
 				Type:        schema.TypeString,
 				Required:    false,
-				ForceNew:    true,
 				Optional:    true,
 				Description: "The description of the auth backend",
 			},
diff --git a/vault/resource_rabbitmq_secret_backend.go b/vault/resource_rabbitmq_secret_backend.go
index 962df3542..05e5ceca9 100644
--- a/vault/resource_rabbitmq_secret_backend.go
+++ b/vault/resource_rabbitmq_secret_backend.go
@@ -38,7 +38,6 @@ func rabbitMQSecretBackendResource() *schema.Resource {
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "Human-friendly description of the mount for the backend.",
 			},
 			"default_lease_ttl_seconds": {