diff --git a/documentation/_templates/layout.html b/documentation/_templates/layout.html
index af4c6acc60..308d5c7a28 100644
--- a/documentation/_templates/layout.html
+++ b/documentation/_templates/layout.html
@@ -1,7 +1,5 @@
 {% extends "!layout.html" %}
 
-{% set script_files = script_files + ['_static/switchers.js'] %}
-
 {% block extrabody %}
 <div id="outdated-warning" style="text-align: center; background-color: #FFBABA; color: #6A0E0E;">
 </div>
diff --git a/documentation/conf.py b/documentation/conf.py
index 83dea72e41..e1a7e5e3dd 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -103,12 +103,13 @@ html_logo = 'sphinx-static/YoctoProject_Logo_RGB.jpg'
 html_static_path = ['sphinx-static']
 
 html_context = {
-    'css_files': [
-        '_static/theme_overrides.css',
-    ],
     'current_version': current_version,
 }
 
+# Add customm CSS and JS files
+html_css_files = ['theme_overrides.css']
+html_js_files = ['switchers.js']
+
 # Hide 'Created using Sphinx' text
 html_show_sphinx = False