diff --git a/modules/services/event-hub-data-source/main.tf b/modules/services/event-hub-data-source/main.tf
index 1efc566..fdfa342 100644
--- a/modules/services/event-hub-data-source/main.tf
+++ b/modules/services/event-hub-data-source/main.tf
@@ -25,7 +25,7 @@ resource "azuread_service_principal" "sysdig_service_principal" {
 # Create a resource group for Sysdig resources
 #---------------------------------------------------------------------------------------------
 resource "azurerm_resource_group" "sysdig_resource_group" {
-  name     = var.resource_group_name
+  name     = "${var.resource_group_name}-${local.subscription_hash}"
   location = var.region
 }
 
@@ -89,7 +89,7 @@ resource "azurerm_role_assignment" "sysdig_data_receiver" {
 # Create diagnostic settings for the subscription
 #---------------------------------------------------------------------------------------------
 resource "azurerm_monitor_diagnostic_setting" "sysdig_diagnostic_setting" {
-  name                           = var.diagnostic_settings_name
+  name                           = "${var.diagnostic_settings_name}-${local.subscription_hash}"
   target_resource_id             = data.azurerm_subscription.sysdig_subscription.id
   eventhub_authorization_rule_id = azurerm_eventhub_namespace_authorization_rule.sysdig_rule.id
   eventhub_name                  = azurerm_eventhub.sysdig_event_hub.name
diff --git a/modules/services/event-hub-data-source/organizational.tf b/modules/services/event-hub-data-source/organizational.tf
index 48f6e41..312d1e7 100644
--- a/modules/services/event-hub-data-source/organizational.tf
+++ b/modules/services/event-hub-data-source/organizational.tf
@@ -26,7 +26,7 @@ locals {
 resource "azurerm_monitor_diagnostic_setting" "sysdig_org_diagnostic_setting" {
   count = var.is_organizational ? length(local.enabled_subscriptions) : 0
 
-  name               = var.diagnostic_settings_name
+  name               = "${var.diagnostic_settings_name}-${local.subscription_hash}"
   target_resource_id = local.enabled_subscriptions[count.index].id
   eventhub_authorization_rule_id = azurerm_eventhub_namespace_authorization_rule.sysdig_rule.id
   eventhub_name                  = azurerm_eventhub.sysdig_event_hub.name