diff --git a/infra/email-server/firewall.tf b/infra/email-server/firewall.tf
index 11896ca..f9ac383 100644
--- a/infra/email-server/firewall.tf
+++ b/infra/email-server/firewall.tf
@@ -13,7 +13,7 @@ resource vultr_firewall_group mail {
 # Create all the tcp rules of type ipv4
 resource vultr_firewall_rule mail_tcp {
   for_each = toset([for v in local.rules.tcp: tostring(v)])
-  firewall_group_id = vultr_instance.mail.id
+  firewall_group_id = vultr_firewall_group.mail.id
   protocol = "tcp"
   ip_type  = "v4"
   subnet      = "0.0.0.0"
@@ -24,7 +24,7 @@ resource vultr_firewall_rule mail_tcp {
 # Create all the udp rules of type ipv4
 resource vultr_firewall_rule mail_udp {
   for_each = toset([for v in local.rules.udp: tostring(v)])
-  firewall_group_id = vultr_instance.mail.id
+  firewall_group_id = vultr_firewall_group.mail.id
   protocol = "udp"
   ip_type  = "v4"
   subnet      = "0.0.0.0"
diff --git a/infra/email-server/ssh.tf b/infra/email-server/ssh.tf
index d678b19..9eea82b 100644
--- a/infra/email-server/ssh.tf
+++ b/infra/email-server/ssh.tf
@@ -17,7 +17,7 @@ resource local_sensitive_file mail_public_key {
 }
 
 resource vultr_ssh_key mail {
-  name = mail_key
+  name = "mail_key"
   ssh_key = tls_private_key.mail.public_key_openssh
 }