diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff72b246a..a2ac8bd7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -450,6 +450,8 @@ jobs:
     if: ${{ !failure() && !cancelled() && github.event.inputs.sandbox == 'true' }}
     needs: [prepare, release]
     runs-on: [self-hosted, dev-server]
+    environment:
+      name: sandbox
     env:
       PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
       
@@ -485,6 +487,9 @@ jobs:
     if: ${{ !failure() && !cancelled() && github.event.inputs.legacySandbox == 'true' }}
     needs: [prepare, release]
     runs-on: [self-hosted, legacy-sandbox-server]
+    environment:
+      name: legacy-sandbox
+      url: "https://sandbox.ietf.org"
     env:
       PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
       
diff --git a/bin/daily b/bin/daily
index 2835a93cc..c65ab5604 100755
--- a/bin/daily
+++ b/bin/daily
@@ -34,7 +34,7 @@ $DTDIR/ietf/manage.py update_external_command_info
 rsync -avzq --delete /a/www/ietf-ftp/iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/
 
 # Get Yang models from Yangcatalog.
-rsync -avzq rsync://yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/
+rsync -avzq rsync://rsync.yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/
 
 # Populate the yang repositories
 $DTDIR/ietf/manage.py populate_yang_model_dirs -v0
diff --git a/ietf/settings.py b/ietf/settings.py
index 5d5340832..271a0b2e6 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -342,8 +342,6 @@ CSRF_TRUSTED_ORIGINS = [
     "https://*.ietf.org",
     'https://meetecho.com',
     'https://*.meetecho.com',
-    'https://gather.town',
-    'https://*.gather.town',
 ]
 CSRF_COOKIE_SAMESITE = 'None'
 CSRF_COOKIE_SECURE = True
@@ -555,7 +553,9 @@ IDNITS_BASE_URL = "https://author-tools.ietf.org/api/idnits"
 IDNITS_SERVICE_URL = "https://author-tools.ietf.org/idnits"
 
 # Content security policy configuration (django-csp)
-CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} https://www.ietf.org/ https://analytics.ietf.org/ https://fonts.googleapis.com/")
+# (In current production, the Content-Security-Policy header is completely set by nginx configuration, but
+#  we try to keep this in sync to avoid confusion)
+CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} http://ietf.org/ https://www.ietf.org/ https://analytics.ietf.org/ https://static.ietf.org")
 
 # The name of the method to use to invoke the test suite
 TEST_RUNNER = 'ietf.utils.test_runner.IetfTestRunner'