diff --git a/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip b/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip
index e3fc61e..066020a 100644
Binary files a/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip and b/patterns/1200a58c76686d520c21edb0_resources/resources-op.zip differ
diff --git a/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip b/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip
index e3fc61e..066020a 100644
Binary files a/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip and b/patterns/39ecde9a0d101628fed3e3be_resources/resources-op.zip differ
diff --git a/patterns/6df66943ca713eed2a25d935_labels/labels.zip b/patterns/6df66943ca713eed2a25d935_labels/labels.zip
index 94422af..e3328b9 100644
Binary files a/patterns/6df66943ca713eed2a25d935_labels/labels.zip and b/patterns/6df66943ca713eed2a25d935_labels/labels.zip differ
diff --git a/patterns/6df66943ca713eed2a25d935_template/webdata.zip b/patterns/6df66943ca713eed2a25d935_template/webdata.zip
index 75523c0..9c3cd16 100644
Binary files a/patterns/6df66943ca713eed2a25d935_template/webdata.zip and b/patterns/6df66943ca713eed2a25d935_template/webdata.zip differ
diff --git a/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip b/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip
index 94422af..e3328b9 100644
Binary files a/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip and b/patterns/6f9c9f982dcc7ef59a34f1f7_labels/labels.zip differ
diff --git a/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip b/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip
index 75523c0..9c3cd16 100644
Binary files a/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip and b/patterns/6f9c9f982dcc7ef59a34f1f7_template/webdata.zip differ
diff --git a/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip b/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip
index 94422af..e3328b9 100644
Binary files a/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip and b/patterns/7518c6cc61e47eec6322ae17_labels/labels.zip differ
diff --git a/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip b/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip
index 75523c0..9c3cd16 100644
Binary files a/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip and b/patterns/7518c6cc61e47eec6322ae17_template/webdata.zip differ
diff --git a/patterns/Base_Security_Response_Headers_36886a1934993d1f69690e1d.yml b/patterns/Base_Security_Response_Headers_36886a1934993d1f69690e1d.yml
index 4ab3f32..e825c5f 100644
--- a/patterns/Base_Security_Response_Headers_36886a1934993d1f69690e1d.yml
+++ b/patterns/Base_Security_Response_Headers_36886a1934993d1f69690e1d.yml
@@ -7,12 +7,4 @@ pattern:
   notes: "The security response headers, which are environment independent and/or\
     \ static"
   properties:
-    responseHeaders:
-    - Strict-Transport-Security: "max-age=63072000; includeSubDomains;"
-    - X-Content-Type-Options: "nosniff"
-    - Referrer-Policy: "strict-origin-when-cross-origin"
-    - X-Frame-Options: "DENY"
-    - Cross-Origin-Opener-Policy: "same-origin"
-    - Cross-Origin-Embedder-Policy: "require-corp"
-    - Cross-Origin-Resource-Policy: "same-site"
-    - Permissions-Policy: "geolocation=(), camera=(), microphone=(), interest-cohort=()"
+    responseHeaders: "var://base-security-response-headers-response-headers"
diff --git a/patterns/GreenMail_f010ec68088ebd56349c7135.yml b/patterns/GreenMail_f010ec68088ebd56349c7135.yml
index f0312b4..0f2dab6 100644
--- a/patterns/GreenMail_f010ec68088ebd56349c7135.yml
+++ b/patterns/GreenMail_f010ec68088ebd56349c7135.yml
@@ -9,6 +9,8 @@ pattern:
     path: "/mail/"
     realm:
     - "pattern://7518c6cc61e47eec6322ae17"
+    addons:
+    - "pattern://4c0d206244a4e16e9aa49f5c"
     backends: "var://greenmail-backend-addresses"
     hostnameCheck: "disabled"
     hostHeader: "backend"
diff --git a/patterns/_GreenMail-OP-Headers_4c0d206244a4e16e9aa49f5c.yml b/patterns/_GreenMail-OP-Headers_4c0d206244a4e16e9aa49f5c.yml
new file mode 100644
index 0000000..4048d52
--- /dev/null
+++ b/patterns/_GreenMail-OP-Headers_4c0d206244a4e16e9aa49f5c.yml
@@ -0,0 +1,7 @@
+schemaVersion: "1.0"
+pattern:
+  id: "4c0d206244a4e16e9aa49f5c"
+  className: "ch.nevis.admin.v4.plugin.nevisproxy.patterns.HeaderCustomization"
+  name: " GreenMail-OP-Headers"
+  properties:
+    responseHeaders: "var://greenmail-op-headers-response-headers"
diff --git a/variables.yml b/variables.yml
index d0fa773..256473a 100644
--- a/variables.yml
+++ b/variables.yml
@@ -50,6 +50,23 @@ variables:
       secretPreserving: true
     value: null
     requireOverloading: true
+  base-security-response-headers-response-headers:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.KeyValueProperty"
+    parameters:
+      minRequired: 1
+      separators:
+      - ":"
+      switchedSeparators: []
+    value:
+    - Strict-Transport-Security: "max-age=63072000; includeSubDomains;"
+    - X-Content-Type-Options: "nosniff"
+    - Referrer-Policy: "strict-origin-when-cross-origin"
+    - X-Frame-Options: "DENY"
+    - Cross-Origin-Opener-Policy: "same-origin"
+    - Cross-Origin-Embedder-Policy: "require-corp"
+    - Cross-Origin-Resource-Policy: "same-site"
+    - Permissions-Policy: "geolocation=(), camera=(), microphone=(), interest-cohort=()"
+    requireOverloading: true
   cert-login-template-parameters:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.TextProperty"
     parameters:
@@ -100,6 +117,15 @@ variables:
       pathInputMode: "OPTIONAL"
     value: "http://rainloop.adn-agov-mail-01-dev/"
     requireOverloading: true
+  greenmail-op-headers-response-headers:
+    className: "ch.nevis.admin.v4.plugin.base.generation.property.KeyValueProperty"
+    parameters:
+      separators:
+      - ":"
+      switchedSeparators: []
+    value:
+    - X-Frame-Options: "DENY"
+    requireOverloading: true
   idm-admin-settings:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.KeyValueProperty"
     parameters: