diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7ca21888c..2f6e982ba 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -18,8 +18,6 @@ on:
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ master ]
-  schedule:
-    - cron: '28 21 * * 0'
 
 jobs:
   analyze:
@@ -49,7 +47,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - run: |
-        sudo sh -c 'export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -y && apt-get install -y \
+        sudo sh -c 'export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y \
           git \
           cmake \
           qtbase5-dev \
diff --git a/.github/workflows/job-test-windows.yml b/.github/workflows/job-test-windows.yml
index 775045741..7cc76af30 100644
--- a/.github/workflows/job-test-windows.yml
+++ b/.github/workflows/job-test-windows.yml
@@ -34,7 +34,7 @@ jobs:
       run: |
         pip install aqtinstall
         python -m aqt install --outputdir $env:QT_BASE_DIR --base $env:QT_BASE_URL $env:QT_VERSION windows desktop win64_msvc2017_64
-        cd $QT_LIB_DIR\msvc2017_64
+        cd $env:QT_LIB_DIR\msvc2017_64
         dir
 
     - name: Cache Bonjour
@@ -47,10 +47,10 @@ jobs:
     - name: Install Bonjour SDK
       if: steps.cache-bonjour.outputs.cache-hit != 'true'
       run: |
-        New-Item -Force -ItemType Directory -Path $env:BONJOUR_BASE_DIR"
+        New-Item -Force -ItemType Directory -Path "$env:BONJOUR_BASE_DIR"
         $client = new-object System.Net.WebClient
         $client.DownloadFile("https://binaries.symless.com/bonjour/BonjourSDK.zip",".\bonjoursdk.zip")
-        [System.IO.Compression.ZipFile]::ExtractToDirectory(".\bonjoursdk.zip", $env:BONJOUR_BASE_DIR)
+        [System.IO.Compression.ZipFile]::ExtractToDirectory(".\bonjoursdk.zip", "$env:BONJOUR_BASE_DIR")
 
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
diff --git a/ChangeLog b/ChangeLog
index 9a196ca12..5bcdb15ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 v1.13.2-snapshot
 ===========
 Bug fixes:
-- #6953 The system does not update server name in Server configuration
+- #6953 | #6961 The system does not update server name in Server configuration
 
 Enhancements:
 - #6954 Move language selection to advanced section 
diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
index d8f6bf648..2b74b7e79 100644
--- a/src/gui/src/ServerConfig.cpp
+++ b/src/gui/src/ServerConfig.cpp
@@ -145,6 +145,7 @@ void ServerConfig::saveSettings()
 
     settings().endGroup();
 
+    m_pAppConfig->saveSettings();
     //Tell the config writer there are changes
     GUI::Config::ConfigWriter::make()->markUnsaved();
 }