diff --git a/system/generic/modules.tf b/system/generic/modules.tf
index a62a76a..0bc98e5 100644
--- a/system/generic/modules.tf
+++ b/system/generic/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "generic"
+  resource                 = "system"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
@@ -11,7 +11,7 @@ module "filter-tags-disk" {
   source = "../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "generic"
+  resource                 = "system"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
   extra_tags               = ["dd_disk:enabled"]