diff --git a/modules/ec2/linux/main.tf b/modules/ec2/linux/main.tf
index efc1f5e..378f098 100644
--- a/modules/ec2/linux/main.tf
+++ b/modules/ec2/linux/main.tf
@@ -3,7 +3,7 @@
 # Provisions an EC2 instance via Service Catalog
 # This is a thin wrapper around the product module with EC2-specific parameters
 
-module "ec2" {
+module "ec2-linux" {
   source = "../../product"
 
   # Service Catalog configuration
diff --git a/modules/ec2/windows/locals.tf b/modules/ec2/windows/locals.tf
index 16368f7..f5baa2c 100644
--- a/modules/ec2/windows/locals.tf
+++ b/modules/ec2/windows/locals.tf
@@ -17,6 +17,7 @@ locals {
   # Add networking parameters if available
   network_parameters = local.vpc_id != null ? {
     VpcId  = local.vpc_id
+    SubnetId = data.aws_subnets.subnets[0].ids != null && length(data.aws_subnets.subnets[0].ids) > 0 ? data.aws_subnets.subnets[0].ids[0] : null
     AZName = local.az_name
   } : {}
 
diff --git a/modules/ec2/windows/main.tf b/modules/ec2/windows/main.tf
index efc1f5e..323ff58 100644
--- a/modules/ec2/windows/main.tf
+++ b/modules/ec2/windows/main.tf
@@ -3,7 +3,7 @@
 # Provisions an EC2 instance via Service Catalog
 # This is a thin wrapper around the product module with EC2-specific parameters
 
-module "ec2" {
+module "ec2-windows" {
   source = "../../product"
 
   # Service Catalog configuration