diff --git a/modules/fleet-membership/main.tf b/modules/fleet-membership/main.tf
index 4a6769671..f39b113f9 100644
--- a/modules/fleet-membership/main.tf
+++ b/modules/fleet-membership/main.tf
@@ -15,8 +15,9 @@
  */
 
 locals {
-  hub_project_id          = var.hub_project_id == "" ? var.project_id : var.hub_project_id
-  gke_hub_membership_name = var.membership_name != "" ? var.membership_name : "${var.project_id}-${var.location}-${var.cluster_name}"
+  hub_project_id                   = var.hub_project_id == "" ? var.project_id : var.hub_project_id
+  gke_hub_membership_name_complete = var.membership_name != "" ? var.membership_name : "${var.project_id}-${var.location}-${var.cluster_name}"
+  gke_hub_membership_name          = trimsuffix(substr(local.gke_hub_membership_name_complete, 0, 63), "-")
 }
 
 # Retrieve GKE cluster info