diff --git a/prod.yaml.jinja b/prod.yaml.jinja
index e5802a94..2fea04ac 100644
--- a/prod.yaml.jinja
+++ b/prod.yaml.jinja
@@ -24,6 +24,9 @@ services:
       DB_FILTER: "{{ odoo_dbfilter | replace('$', '$$') }}"
       DOODBA_ENVIRONMENT: "${DOODBA_ENVIRONMENT-prod}"
       INITIAL_LANG: "{{ odoo_initial_lang }}"
+      {%- if odoo_version >= 16.0 %}
+      ODOO_BUS_PUBLIC_SAMESITE_WS: 1
+      {%- endif %}
       {%- if smtp_relay_host %}
       SMTP_SERVER: smtplocal
       {%- endif %}
diff --git a/test.yaml.jinja b/test.yaml.jinja
index ef9713ce..d9c28355 100644
--- a/test.yaml.jinja
+++ b/test.yaml.jinja
@@ -15,6 +15,9 @@ services:
       - .docker/db-access.env
     environment:
       DOODBA_ENVIRONMENT: "${DOODBA_ENVIRONMENT-test}"
+      {%- if odoo_version >= 16.0 %}
+      ODOO_BUS_PUBLIC_SAMESITE_WS: 1
+      {%- endif %}
       # To install demo data export DOODBA_WITHOUT_DEMO=false
       WITHOUT_DEMO: "${DOODBA_WITHOUT_DEMO-all}"
       SMTP_PORT: "1025"