diff --git a/docker/docker-compose.ci.yml b/docker/docker-compose.ci.yml
index 40bd95e6..2687eaa5 100644
--- a/docker/docker-compose.ci.yml
+++ b/docker/docker-compose.ci.yml
@@ -16,7 +16,7 @@ services:
       context: ..
       dockerfile: docker/web/Dockerfile
       args:
-        - OS_VERSION=buster
+        - OS_VERSION=bullseye
     volumes:
       - ./volumes/images:/home/pi/images:delegated
     init: true
diff --git a/python/web/src/web.py b/python/web/src/web.py
index 270e3dfc..b4c7d661 100644
--- a/python/web/src/web.py
+++ b/python/web/src/web.py
@@ -1373,12 +1373,13 @@ def healthcheck():
 def detect_locale():
     """
     Get the detected locale to use for UI string translations.
-    This requires the Flask app to have started first.
+    Assign the language string to objects to be used for requests.
     """
     if "language" not in session.keys():
         session["language"] = get_locale()
-        piscsi_cmd.locale = session["language"]
-        file_cmd.locale = session["language"]
+
+    piscsi_cmd.locale = session["language"]
+    file_cmd.locale = session["language"]
 
 
 @APP.before_request