diff --git a/.github/workflows/playbook-test.yml b/.github/workflows/playbook-test.yml
index 3dcc354c0fa..980ec0a2807 100644
--- a/.github/workflows/playbook-test.yml
+++ b/.github/workflows/playbook-test.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
@@ -31,7 +31,6 @@ jobs:
         PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
     - name: Install Dependencies
       run: |
-        pip install "setuptools<58" wheel
         pip install demjson
         pip install -r requirements.txt
     - name: Run Make test.syntax
diff --git a/.github/workflows/syntax-test.yml b/.github/workflows/syntax-test.yml
index fbf839ba786..690a90b9ee8 100644
--- a/.github/workflows/syntax-test.yml
+++ b/.github/workflows/syntax-test.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
@@ -27,11 +27,8 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
-      env:
-        PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
     - name: Install Dependencies
       run: |
-        pip install "setuptools<58" wheel
         pip install demjson
         pip install -r requirements.txt
     - name: Run Make test.syntax
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80855cf4846..21c74be4008 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 Add any new changes to the top(right below this line).
 
+- Role: nginx
+  - Add the possibility to add the header `Content-Security-Policy frame-ancestors`. This is configured by the
+    EDXAPP_LMS_IFRAME_ENABLED switcher and EDXAPP_LMS_FRAME-ANCESTORS value.
+
 - Role: edxapp BREAKING_CHANGE
   - The sandbox environment that runs instructor written python code used to run python 2.7. We update the default to
     python 3.5 but provide a new variable to be able to go back to the old setting.  If `edxapp_sandbox_python_version`