diff --git a/main.tf b/main.tf
index b83943d9..3b0ec01c 100644
--- a/main.tf
+++ b/main.tf
@@ -20,10 +20,8 @@ locals {
   # Get account ID
   account_id = ibm_resource_instance.en_instance.account_id
 
-  # temporary workaround until https://github.ibm.com/Notification-Hub/adopters/issues/150 is implemented
-  # Get public/private endpoint
-  en_private_endpoint = "https://private.${var.region}.event-notifications.cloud.ibm.com"
-  en_public_endpoint  = "https://${var.region}.event-notifications.cloud.ibm.com"
+  en_endpoints = { for key, value in ibm_resource_instance.en_instance.extensions : key => value
+  }
 }
 
 resource "ibm_resource_instance" "en_instance" {
diff --git a/outputs.tf b/outputs.tf
index 92a598ba..86fc7841 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -36,10 +36,10 @@ output "service_credentials_object" {
 
 output "event_notifications_private_endpoint" {
   description = "Instance private endpoint URL"
-  value       = local.en_private_endpoint
+  value       = local.en_endpoints["endpoints.private"]
 }
 
 output "event_notifications_public_endpoint" {
   description = "Instance public endpoint URL"
-  value       = local.en_public_endpoint
+  value       = local.en_endpoints["endpoints.public"]
 }