diff --git a/modules/compute-vm/main.tf b/modules/compute-vm/main.tf
index b213f0b3b..0430db20c 100644
--- a/modules/compute-vm/main.tf
+++ b/modules/compute-vm/main.tf
@@ -69,10 +69,12 @@ resource "google_compute_disk" "boot" {
   count   = !var.create_template && var.boot_disk.use_independent_disk ? 1 : 0
   project = var.project_id
   zone    = var.zone
-  name    = "${var.name}-boot"
-  type    = var.boot_disk.initialize_params.type
-  size    = var.boot_disk.initialize_params.size
-  image   = var.boot_disk.initialize_params.image
+  # by default, GCP creates boot disks with the same name as instance, the deviation here is kept for backwards
+  # compatibility
+  name  = "${var.name}-boot"
+  type  = var.boot_disk.initialize_params.type
+  size  = var.boot_disk.initialize_params.size
+  image = var.boot_disk.initialize_params.image
   labels = merge(var.labels, {
     disk_name = "boot"
     disk_type = var.boot_disk.initialize_params.type
diff --git a/modules/compute-vm/resource-policies.tf b/modules/compute-vm/resource-policies.tf
index 743e1e335..40ce2d4ba 100644
--- a/modules/compute-vm/resource-policies.tf
+++ b/modules/compute-vm/resource-policies.tf
@@ -148,7 +148,8 @@ resource "google_compute_disk_resource_policy_attachment" "boot" {
     google_compute_resource_policy.snapshot[each.value].name,
     each.value
   )
-  disk       = var.name
+  # if independent disk is used for boot disk it will have a different name compared to when created implicitly
+  disk       = !var.create_template && var.boot_disk.use_independent_disk ? google_compute_disk.boot[0].name : var.name
   depends_on = [google_compute_instance.default]
 }