diff --git a/vpc-interface-endpoint/main.tf b/vpc-interface-endpoint/main.tf
index d2188fb..6f6c75c 100644
--- a/vpc-interface-endpoint/main.tf
+++ b/vpc-interface-endpoint/main.tf
@@ -62,7 +62,8 @@ locals {
   full_service_parts = split(".", local.service)
 
   #  short_service = length(regexall("^com.amazonaws", var.service)) == 0 ? var.service : replace(local.service, format("com.amazonaws.%v.", local.region), "")
-  short_service = element(local.full_service_parts, length(local.full_service_parts) - 1)
+  #  short_service = element(local.full_service_parts, length(local.full_service_parts) - 1)
+  short_service = join(".", slice(local.full_service_parts, index(local.full_service_parts, local.region), length(local.full_service_parts)))
 
   base_tags = {
     "boc:tf_module_version" = local._module_version