diff --git a/news/4626.documentation b/news/4626.documentation
new file mode 100644
index 0000000000..7898850040
--- /dev/null
+++ b/news/4626.documentation
@@ -0,0 +1 @@
+Fix documentation build, add pins @sneridagh
diff --git a/news/4627.feature b/news/4627.feature
new file mode 100644
index 0000000000..dd91379ab9
--- /dev/null
+++ b/news/4627.feature
@@ -0,0 +1 @@
+Set sameSite in I18N_LANGUAGE cookie @sneridagh
diff --git a/requirements-docs.txt b/requirements-docs.txt
index 7c4e331ab9..d4596cb251 100644
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -5,7 +5,8 @@ lesscpy
 linkify-it-py
 myst-parser
 sphinx-autobuild
-sphinx-book-theme
+pydata-sphinx-theme<=0.8.99
+sphinx-book-theme==0.3.3
 sphinx-copybutton
 sphinx-sitemap
 sphinx-togglebutton
diff --git a/src/actions/language/language.js b/src/actions/language/language.js
index 6ea855c8b2..e62d4be472 100644
--- a/src/actions/language/language.js
+++ b/src/actions/language/language.js
@@ -7,6 +7,7 @@ export function changeLanguageCookies(language, req) {
 
   const cookieOptions = getCookieOptions({
     secure: req?.protocol?.startsWith('https') ? true : false,
+    sameSite: 'strict',
   });
 
   if (!req) {