diff --git a/.github/workflows/job-test-linux-fedora.yml b/.github/workflows/job-test-linux-fedora.yml
index b449d86cf..c43e0cc5d 100644
--- a/.github/workflows/job-test-linux-fedora.yml
+++ b/.github/workflows/job-test-linux-fedora.yml
@@ -20,6 +20,7 @@ jobs:
           - distro: fedora33
           - distro: fedora34
           - distro: fedora35
+          - distro: fedora36
 
     name: ${{ matrix.distro }}
 
diff --git a/ChangeLog b/ChangeLog
index fe13ec99a..b51dee78c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Enhancements:
 - #7143 Add ability to stop synergy on the login screen
 - #7157 | #7160 Synergy business accepts only business licenses
 - #7166 Replace annoying language notifications with warnings in logs
+- #7181 Add Fedora 36
 
 Bug fixes:
 - #7144 Fix double lines when pasting text from Linux to Windows
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b3f7db0d6..26694a9ff 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ jobs:
 
   - job: Linux
     pool:
-      vmImage: 'ubuntu-latest'
+      vmImage: "ubuntu-latest"
 
     strategy:
       matrix:
@@ -67,6 +67,10 @@ jobs:
           image: symless/synergy-core:fedora35
           packager: rpm
           name: fedora35
+        fedora36:
+          image: symless/synergy-core:fedora36
+          packager: rpm
+          name: fedora36
         centos7.6:
           image: symless/synergy-core:centos7.6
           packager: rpm
@@ -107,9 +111,9 @@ jobs:
       vmImage: $[ variables['image'] ]
 
     variables:
-      QT_VERSION: '5.15.2'
-      QT_PATH: '/usr/local/opt/qt'
-      Qt5_DIR: '$(QT_PATH)/$(QT_VERSION)/clang_64'
+      QT_VERSION: "5.15.2"
+      QT_PATH: "/usr/local/opt/qt"
+      Qt5_DIR: "$(QT_PATH)/$(QT_VERSION)/clang_64"
 
     steps:
       - template: CI/checkout.yml
@@ -135,9 +139,9 @@ jobs:
       vmImage: $[ variables['image'] ]
 
     variables:
-      QT_VERSION: '5.12.6'
+      QT_VERSION: "5.12.6"
       QLI_OUT_DIR: '.\deps\Qt'
-      QLI_BASE_URL: 'http://qt.mirror.constant.com/'
+      QLI_BASE_URL: "http://qt.mirror.constant.com/"
       QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64'
       QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017'
       BONJOUR_SDK_DIR: 'deps\BonjourSDK'