diff --git a/modules/opennext-cloudfront/cloudfront.tf b/modules/opennext-cloudfront/cloudfront.tf
index 36a1a6c..bf36ad8 100644
--- a/modules/opennext-cloudfront/cloudfront.tf
+++ b/modules/opennext-cloudfront/cloudfront.tf
@@ -146,6 +146,15 @@ resource "aws_cloudfront_response_headers_policy" "response_headers_policy" {
       }
     }
   }
+  remove_headers_config{
+    items{
+      header = "Server"
+      }
+
+    items{
+      header = "X-Opennext"
+    }
+  }
 }
 
 resource "aws_cloudfront_distribution" "distribution" {