diff --git a/src/components/Header.astro b/src/components/Header.astro
index 6073751..f5ec109 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -1,7 +1,6 @@
 ---
 // Header.astro
 ---
-
 <header>
   <nav>
     <ul class="main-menu">
@@ -29,6 +28,7 @@
             <a href="/services#anonymity">Anonymity</a>
             <ul class="submenu">
               <li><a href="/services/tor">TOR Network</a></li>
+              <li><a href="/services/grapheneos">GrapheneOS Setup</a></li>
               <li><a href="/services/linux-setup">Linux Setup</a></li>
             </ul>
           </li>
@@ -37,6 +37,7 @@
             <ul class="submenu">
               <li><a href="/services/openwrt">OpenWRT Router</a></li>
               <li><a href="/services/nas">NAS Setup</a></li>
+              <li><a href="/services/mail-server">Mail Server Setup</a></li>
               <li><a href="/services/proxmox">Proxmox VE</a></li>
               <li><a href="/services/vps">VPS Setup</a></li>
             </ul>
diff --git a/src/pages/services.astro b/src/pages/services.astro
index bc0cd49..cd260ec 100644
--- a/src/pages/services.astro
+++ b/src/pages/services.astro
@@ -60,6 +60,12 @@ import Layout from '../components/Layout.astro';
     <a href="/services/tor" class="learn-more-link">Learn more</a>
   </div>
   
+  <div class="service-card" id="grapheneos">
+    <h3>GrapheneOS Setup</h3>
+    <p>Transform your mobile device into a privacy-focused, security-hardened smartphone with GrapheneOS, a privacy and security-focused mobile operating system that provides enhanced protection without sacrificing usability.</p>
+    <a href="/services/grapheneos" class="learn-more-link">Learn more</a>
+  </div>
+  
   <div class="service-card" id="linux-setup">
     <h3>Linux Setup</h3>
     <p>Make the transition to Linux smooth and hassle-free with our comprehensive setup services. We'll help you select the right distribution, handle the installation process, configure your system, and provide guidance on essential software and daily operations.</p>
@@ -82,6 +88,12 @@ import Layout from '../components/Layout.astro';
     <a href="/services/nas" class="learn-more-link">Learn more</a>
   </div>
   
+  <div class="service-card" id="mail-server">
+    <h3>Mail Server Setup</h3>
+    <p>Take complete control of your email communications with a professionally configured, self-hosted mail server that provides enhanced privacy, security, and independence from Big Tech email providers.</p>
+    <a href="/services/mail-server" class="learn-more-link">Learn more</a>
+  </div>
+  
   <div class="service-card" id="proxmox">
     <h3>Proxmox VE Setup</h3>
     <p>Maximize your hardware resources with Proxmox Virtual Environment, a powerful open-source virtualization platform that enables you to run multiple virtual machines and containers on a single physical server.</p>
diff --git a/src/pages/services/grapheneos.astro b/src/pages/services/grapheneos.astro
new file mode 100644
index 0000000..5fd76f1
--- /dev/null
+++ b/src/pages/services/grapheneos.astro
@@ -0,0 +1,168 @@
+---
+import Layout from '../../components/Layout.astro';
+---
+
+<Layout title="GrapheneOS Setup">
+  <h1>GrapheneOS Setup Service</h1>
+  
+  <div class="service-intro">
+    <p>Transform your mobile device into a privacy-focused, security-hardened smartphone with GrapheneOS, a privacy and security-focused mobile operating system that provides enhanced protection without sacrificing usability.</p>
+  </div>
+  
+  <div class="service-description">
+    <h2>What is GrapheneOS?</h2>
+    <p>GrapheneOS is a privacy and security-focused mobile operating system built on the Android Open Source Project (AOSP). It implements numerous security and privacy enhancements including hardened memory allocation, network and sensor permissions, and a sandboxed Google Play compatibility layer. Unlike standard Android, GrapheneOS removes Google's tracking and telemetry while providing users with granular control over app permissions and data access.</p>
+    
+    <h2>Our GrapheneOS Services</h2>
+    <p>We offer comprehensive GrapheneOS implementation services to help you transition to a more private mobile experience:</p>
+    
+    <div class="service-feature">
+      <h3>Device Compatibility and Installation</h3>
+      <p>We'll verify your device compatibility (currently supporting Google Pixel devices), handle the complete installation process including bootloader unlocking, and ensure proper verification of the GrapheneOS installation. The process includes backing up your existing data, installing GrapheneOS with verified signatures, and setting up secure boot to maintain the integrity of your system.</p>
+    </div>
+    
+    <div class="service-feature">
+      <h3>Privacy Configuration and App Setup</h3>
+      <p>We'll configure GrapheneOS with privacy-optimized settings, install F-Droid and other privacy-respecting app stores, and help you find alternatives to Google services. This includes setting up the sandboxed Google Play Services (if needed for specific apps), configuring network permissions, and implementing contact and calendar synchronization through privacy-focused services.</p>
+    </div>
+    
+    <div class="service-feature">
+      <h3>Data Migration and Training</h3>
+      <p>We'll assist with migrating your essential data from your previous device, provide comprehensive training on GrapheneOS features and privacy controls, and create custom documentation for your specific setup. You'll learn how to manage app permissions, use the enhanced security features, and maintain your privacy-focused mobile environment.</p>
+    </div>
+    
+    <h2>Benefits of GrapheneOS</h2>
+    <ul>
+      <li><span class="highlight">Enhanced Privacy:</span> Eliminate Google's pervasive tracking and data collection while maintaining smartphone functionality</li>
+      <li><span class="highlight">Improved Security:</span> Benefit from memory corruption protection, stronger sandboxing, and regular security updates</li>
+      <li><span class="highlight">Granular Permissions:</span> Control exactly what data and sensors each app can access</li>
+      <li><span class="highlight">Network Privacy:</span> Advanced network permission controls and optional Tor integration</li>
+      <li><span class="highlight">Open Source Transparency:</span> Auditable code base with no hidden backdoors or proprietary components</li>
+      <li><span class="highlight">Google Play Compatibility:</span> Run essential Android apps through a sandboxed Google Play Services implementation</li>
+      <li><span class="highlight">Regular Updates:</span> Timely security patches and feature updates from the GrapheneOS team</li>
+    </ul>
+    
+    <h2>Features Included</h2>
+    <p>Your GrapheneOS setup will include:</p>
+    <ul>
+      <li>Complete GrapheneOS installation with signature verification</li>
+      <li>Privacy-optimized system configuration</li>
+      <li>F-Droid app store setup for open-source applications</li>
+      <li>Optional sandboxed Google Play Services installation</li>
+      <li>Enhanced permission and privacy controls configuration</li>
+      <li>Secure network and sensor permission management</li>
+      <li>Contact and calendar synchronization setup (privacy-focused options)</li>
+      <li>Essential app installation and configuration</li>
+      <li>Data backup and migration from previous device</li>
+      <li>Comprehensive user training and documentation</li>
+    </ul>
+    
+    <h2>Compatible Devices</h2>
+    <p>GrapheneOS currently supports Google Pixel devices due to their strong security features and hardware requirements:</p>
+    <ul>
+      <li>Google Pixel 8 Pro</li>
+      <li>Google Pixel 8</li>
+      <li>Google Pixel 7a</li>
+      <li>Google Pixel 7 Pro</li>
+      <li>Google Pixel 7</li>
+      <li>Google Pixel 6a</li>
+      <li>Google Pixel 6 Pro</li>
+      <li>Google Pixel 6</li>
+      <li>And select older Pixel models (with varying support lifecycles)</li>
+    </ul>
+    <p>We'll help you determine if your current device is compatible or recommend an appropriate Pixel device for your needs and budget.</p>
+    
+    <h2>Privacy-Focused App Alternatives</h2>
+    <p>As part of your GrapheneOS setup, we'll help you transition to privacy-respecting alternatives:</p>
+    <ul>
+      <li><span class="highlight">Web Browser:</span> Vanadium (hardened Chromium) or Firefox with privacy extensions</li>
+      <li><span class="highlight">Email:</span> K-9 Mail, FairEmail, or Tutanota</li>
+      <li><span class="highlight">Messaging:</span> Signal, Element (Matrix), or Briar</li>
+      <li><span class="highlight">Maps:</span> Organic Maps, OsmAnd, or Magic Earth</li>
+      <li><span class="highlight">Camera:</span> Open Camera with enhanced privacy controls</li>
+      <li><span class="highlight">File Manager:</span> Material Files or Simple File Manager</li>
+      <li><span class="highlight">Password Manager:</span> Bitwarden or KeePassDX</li>
+      <li><span class="highlight">Cloud Storage:</span> Nextcloud client or Syncthing</li>
+    </ul>
+    
+    <h2>Our Approach</h2>
+    <p>When setting up GrapheneOS for clients, we take a comprehensive approach that includes:</p>
+    <ul>
+      <li>Assessment of your current mobile usage patterns and essential apps</li>
+      <li>Device compatibility verification and procurement assistance if needed</li>
+      <li>Secure installation process with proper signature verification</li>
+      <li>Privacy-first configuration of all system settings</li>
+      <li>App ecosystem transition with privacy-focused alternatives</li>
+      <li>Data migration planning and execution</li>
+      <li>Comprehensive training on GrapheneOS features and privacy controls</li>
+      <li>Creation of personalized documentation for ongoing reference</li>
+      <li>Follow-up support to address questions and optimization needs</li>
+    </ul>
+    
+    <h2>Important Considerations</h2>
+    <p>Before transitioning to GrapheneOS, it's important to understand:</p>
+    <ul>
+      <li>Some apps may not work without Google Play Services (though sandboxed Play Services can often resolve this)</li>
+      <li>Banking and payment apps may have compatibility issues due to enhanced security measures</li>
+      <li>The learning curve for advanced privacy features may require some adjustment</li>
+      <li>Regular backups become more important with a privacy-focused setup</li>
+      <li>Some convenience features (like seamless Google integration) will be replaced with privacy-respecting alternatives</li>
+    </ul>
+    <p>We'll work with you to address these considerations and find solutions that maintain your mobile functionality while dramatically improving your privacy.</p>
+    
+    <h2>Why Choose GrapheneOS Over Other Privacy ROMs?</h2>
+    <p>GrapheneOS stands out among privacy-focused Android distributions due to:</p>
+    <ul>
+      <li><span class="highlight">Security Focus:</span> Developed by security researchers with emphasis on exploitation mitigation</li>
+      <li><span class="highlight">Verified Boot:</span> Maintains Android's verified boot system for tamper detection</li>
+      <li><span class="highlight">Regular Updates:</span> Consistent, timely security updates and feature improvements</li>
+      <li><span class="highlight">Professional Development:</span> Developed by experienced security professionals rather than hobbyists</li>
+      <li><span class="highlight">Compatibility Balance:</span> Maintains app compatibility while maximizing privacy and security</li>
+    </ul>
+  </div>
+  
+  <div class="service-cta">
+    <h2>Take Control of Your Mobile Privacy</h2>
+    <p>Ready to transform your smartphone into a privacy-focused device that respects your digital rights? Contact me today to discuss GrapheneOS installation and setup for your specific needs.</p>
+    <a href="/contact" class="cta-button">Contact Us</a>
+  </div>
+</Layout>
+
+<style>
+  .service-intro {
+    font-size: 1.2rem;
+    margin: 1.5rem 0;
+    padding: 1.5rem;
+    background-color: var(--gruvbox-bg-soft);
+    border-radius: 5px;
+    border-left: 4px solid var(--gruvbox-green);
+  }
+  
+  .service-description {
+    margin: 2rem 0;
+  }
+  
+  .service-feature {
+    margin: 1.5rem 0;
+    padding: 1.5rem;
+    background-color: var(--gruvbox-bg-soft);
+    border-radius: 5px;
+  }
+  
+  .service-feature h3 {
+    color: var(--gruvbox-aqua);
+    margin-top: 0;
+  }
+  
+  .service-cta {
+    margin: 2rem 0;
+    padding: 1.5rem;
+    background-color: var(--gruvbox-bg-alt);
+    border-radius: 5px;
+    text-align: center;
+  }
+  
+  .service-cta .cta-button {
+    margin-top: 1rem;
+  }
+</style>
diff --git a/src/pages/services/mail-server.astro b/src/pages/services/mail-server.astro
new file mode 100644
index 0000000..bed4407
--- /dev/null
+++ b/src/pages/services/mail-server.astro
@@ -0,0 +1,183 @@
+---
+import Layout from '../../components/Layout.astro';
+---
+
+<Layout title="Mail Server Setup">
+  <h1>Mail Server Setup Service</h1>
+  
+  <div class="service-intro">
+    <p>Take complete control of your email communications with a professionally configured, self-hosted mail server that provides enhanced privacy, security, and independence from Big Tech email providers.</p>
+  </div>
+  
+  <div class="service-description">
+    <h2>What is a Self-Hosted Mail Server?</h2>
+    <p>A self-hosted mail server is your own private email system that handles sending, receiving, and storing your email messages on infrastructure you control. Unlike Gmail, Outlook, or other commercial providers, your mail server keeps your communications private, eliminates data mining, and provides complete autonomy over your digital correspondence. This solution combines robust security with the convenience of modern email while ensuring your messages remain truly private.</p>
+    
+    <h2>Our Mail Server Services</h2>
+    <p>We offer comprehensive mail server implementation services designed to provide reliable, secure email hosting:</p>
+    
+    <div class="service-feature">
+      <h3>Complete Mail Server Installation</h3>
+      <p>We'll set up a full-featured mail server using proven solutions like Mail-in-a-Box, iRedMail, or custom Postfix/Dovecot configurations on your VPS or dedicated server. This includes proper DNS configuration, SSL/TLS certificates, spam filtering, and security hardening to ensure reliable email delivery and protection against common threats.</p>
+    </div>
+    
+    <div class="service-feature">
+      <h3>Domain and DNS Configuration</h3>
+      <p>We'll handle the complex DNS configuration required for reliable email delivery, including SPF, DKIM, and DMARC records that authenticate your emails and prevent them from being marked as spam. Your custom domain will be properly configured with all necessary mail exchange records and security policies to ensure maximum deliverability.</p>
+    </div>
+    
+    <div class="service-feature">
+      <h3>Security and Anti-Spam Implementation</h3>
+      <p>We'll implement comprehensive security measures including encrypted connections (TLS), strong authentication mechanisms, advanced spam filtering with SpamAssassin or Rspamd, virus scanning, and proper firewall configuration. Your mail server will be protected against common email-based attacks while maintaining usability for legitimate communications.</p>
+    </div>
+    
+    <div class="service-feature">
+      <h3>Webmail and Client Configuration</h3>
+      <p>We'll install and configure a modern webmail interface (such as Roundcube or Rainloop) for browser-based email access, and help you set up your email clients (Thunderbird, Apple Mail, etc.) on all your devices. This includes proper security settings, encrypted connections, and synchronization across multiple devices.</p>
+    </div>
+    
+    <h2>Benefits of Self-Hosted Email</h2>
+    <ul>
+      <li><span class="highlight">Complete Privacy:</span> Your emails remain on your infrastructure, never scanned or analyzed by third parties for advertising</li>
+      <li><span class="highlight">Data Ownership:</span> Maintain full control over your email data with no risk of account suspension or service termination</li>
+      <li><span class="highlight">Custom Domain:</span> Use your own professional domain name for email addresses (you@yourdomain.com)</li>
+      <li><span class="highlight">Unlimited Storage:</span> Scale storage capacity based on your needs without subscription limitations</li>
+      <li><span class="highlight">Enhanced Security:</span> Implement your own security policies and encryption standards</li>
+      <li><span class="highlight">No Vendor Lock-in:</span> Avoid dependence on commercial email providers that can change policies or pricing</li>
+      <li><span class="highlight">Professional Image:</span> Custom domain email addresses enhance credibility for business communications</li>
+    </ul>
+    
+    <h2>Features Included</h2>
+    <p>Your mail server implementation will include:</p>
+    <ul>
+      <li>Complete mail server installation with secure configuration</li>
+      <li>Custom domain setup with professional email addresses</li>
+      <li>Comprehensive DNS configuration (MX, SPF, DKIM, DMARC)</li>
+      <li>SSL/TLS certificates for encrypted connections</li>
+      <li>Advanced spam and virus filtering</li>
+      <li>Webmail interface for browser-based access</li>
+      <li>IMAP/SMTP configuration for email clients</li>
+      <li>Automated backup system for email data</li>
+      <li>User management system for multiple email accounts</li>
+      <li>Mobile device configuration support</li>
+      <li>Comprehensive monitoring and alerting</li>
+      <li>Documentation and ongoing support guidance</li>
+    </ul>
+    
+    <h2>Mail Server Solutions We Use</h2>
+    <p>We work with various mail server platforms based on your specific needs:</p>
+    <ul>
+      <li><span class="highlight">Mail-in-a-Box:</span> All-in-one solution ideal for beginners with automatic configuration</li>
+      <li><span class="highlight">iRedMail:</span> Full-featured mail server with web administration interface</li>
+      <li><span class="highlight">Custom Postfix/Dovecot:</span> Highly customizable solution for advanced requirements</li>
+      <li><span class="highlight">Mailcow:</span> Docker-based mail server with modern web interface</li>
+      <li><span class="highlight">Zimbra:</span> Enterprise-grade collaboration platform with email, calendar, and contacts</li>
+    </ul>
+    
+    <h2>Important Considerations</h2>
+    <p>Running your own mail server requires understanding several important factors:</p>
+    <ul>
+      <li><span class="highlight">Deliverability Challenges:</span> New mail servers may initially face delivery issues until reputation is established</li>
+      <li><span class="highlight">Maintenance Requirements:</span> Regular updates and monitoring are essential for security and reliability</li>
+      <li><span class="highlight">Technical Complexity:</span> Email systems are complex and require proper configuration for reliable operation</li>
+      <li><span class="highlight">Backup Critical:</span> Email data loss can be catastrophic, requiring robust backup strategies</li>
+      <li><span class="highlight">Spam Management:</span> Ongoing maintenance of spam filters and security measures is necessary</li>
+    </ul>
+    <p>We address these challenges through proper implementation, comprehensive documentation, and ongoing support guidance.</p>
+    
+    <h2>Our Approach</h2>
+    <p>When setting up mail servers for clients, we take a comprehensive approach that includes:</p>
+    <ul>
+      <li>Assessment of your email needs, technical comfort level, and infrastructure requirements</li>
+      <li>Selection of the most appropriate mail server solution for your use case</li>
+      <li>Professional server setup with security best practices from the start</li>
+      <li>Proper DNS configuration to ensure reliable email delivery</li>
+      <li>Implementation of comprehensive security measures and spam protection</li>
+      <li>Thorough testing of email flow in both directions</li>
+      <li>Configuration of email clients on all your devices</li>
+      <li>Establishment of backup and monitoring procedures</li>
+      <li>Documentation of the complete setup for future reference</li>
+      <li>Knowledge transfer to ensure you can maintain your mail server</li>
+    </ul>
+    
+    <h2>Security Features</h2>
+    <p>Your mail server will include comprehensive security measures:</p>
+    <ul>
+      <li>Transport Layer Security (TLS) encryption for all connections</li>
+      <li>DKIM signature verification for message authenticity</li>
+      <li>SPF and DMARC policies to prevent email spoofing</li>
+      <li>Rate limiting to prevent abuse and spam</li>
+      <li>Fail2ban integration for intrusion prevention</li>
+      <li>Regular security updates and patch management</li>
+      <li>Secure password policies and two-factor authentication options</li>
+      <li>Encrypted storage for sensitive email data</li>
+      <li>Comprehensive logging and monitoring for security events</li>
+    </ul>
+    
+    <h2>Hosting Options</h2>
+    <p>Your mail server can be hosted on various platforms:</p>
+    <ul>
+      <li><span class="highlight">Virtual Private Server (VPS):</span> Cost-effective cloud hosting with provider flexibility</li>
+      <li><span class="highlight">Dedicated Server:</span> Maximum performance and control for high-volume email</li>
+      <li><span class="highlight">Home Server:</span> Complete control with proper network configuration and backup power</li>
+      <li><span class="highlight">Hybrid Setup:</span> Combination of cloud and on-premises components for optimal reliability</li>
+    </ul>
+    <p>We'll help you select the best hosting option based on your requirements, budget, and technical preferences.</p>
+    
+    <h2>Migration Services</h2>
+    <p>If you're transitioning from another email provider, we offer:</p>
+    <ul>
+      <li>Complete email migration from Gmail, Outlook, or other providers</li>
+      <li>Preservation of folder structure and email organization</li>
+      <li>Contact and calendar migration where applicable</li>
+      <li>Gradual transition strategies to minimize disruption</li>
+      <li>Forwarding setup during transition period</li>
+      <li>Verification of successful migration before decommissioning old accounts</li>
+    </ul>
+  </div>
+  
+  <div class="service-cta">
+    <h2>Reclaim Your Email Independence</h2>
+    <p>Ready to take control of your email communications with a secure, private mail server? Contact me today to discuss implementing a custom mail server solution tailored to your specific needs.</p>
+    <a href="/contact" class="cta-button">Contact Us</a>
+  </div>
+</Layout>
+
+<style>
+  .service-intro {
+    font-size: 1.2rem;
+    margin: 1.5rem 0;
+    padding: 1.5rem;
+    background-color: var(--gruvbox-bg-soft);
+    border-radius: 5px;
+    border-left: 4px solid var(--gruvbox-orange);
+  }
+  
+  .service-description {
+    margin: 2rem 0;
+  }
+  
+  .service-feature {
+    margin: 1.5rem 0;
+    padding: 1.5rem;
+    background-color: var(--gruvbox-bg-soft);
+    border-radius: 5px;
+  }
+  
+  .service-feature h3 {
+    color: var(--gruvbox-aqua);
+    margin-top: 0;
+  }
+  
+  .service-cta {
+    margin: 2rem 0;
+    padding: 1.5rem;
+    background-color: var(--gruvbox-bg-alt);
+    border-radius: 5px;
+    text-align: center;
+  }
+  
+  .service-cta .cta-button {
+    margin-top: 1rem;
+  }
+</style>