diff --git a/src/modules/domains/services/dns.service.ts b/src/modules/domains/services/dns.service.ts
index b177ddc..95fcbd7 100644
--- a/src/modules/domains/services/dns.service.ts
+++ b/src/modules/domains/services/dns.service.ts
@@ -90,7 +90,8 @@ export class DnsService {
 
     // MX Record
     requiredRecords.push({
-      name: domain.name,
+      // name: domain.name,
+      name: "@",
       type: DNSRecordType.MX,
       value: this.mailServerDomain,
       priority: 10,
@@ -100,8 +101,9 @@ export class DnsService {
 
     // SPF Record
     requiredRecords.push({
-      name: domain.name,
-      type: DNSRecordType.SPF,
+      // name: domain.name,
+      name: "@",
+      type: DNSRecordType.TXT,
       value: this.spfRecord,
       isRequired: true,
       description: "Sender Policy Framework record",
@@ -110,8 +112,9 @@ export class DnsService {
     // DMARC Record
     const dmarcRecord = `v=DMARC1; p=quarantine; rua=mailto:dmarc@${domain.name}; ruf=mailto:dmarc@${domain.name}`;
     requiredRecords.push({
-      name: `_dmarc.${domain.name}`,
-      type: DNSRecordType.DMARC,
+      // name: `_dmarc.${domain.name}`,
+      name: `_dmarc`,
+      type: DNSRecordType.TXT,
       value: dmarcRecord,
       isRequired: true,
       description: "DMARC policy record",
@@ -125,7 +128,7 @@ export class DnsService {
         type: recordData.type!,
         value: recordData.value!,
         domain,
-        isRequired: recordData.isRequired ?? true,
+        isRequired: recordData.isRequired,
         description: recordData.description,
         priority: recordData.priority,
         ttl: recordData.ttl,
@@ -145,7 +148,7 @@ export class DnsService {
   async createDKIMRecord(domain: Domain, selector: string, dkimName: string, dkimValue: string, wildduckId: string) {
     const dkimRecord = this.dnsRecordRepository.create({
       name: dkimName,
-      type: DNSRecordType.DKIM,
+      type: DNSRecordType.TXT,
       value: dkimValue,
       domain,
       isRequired: true,