diff --git a/.github/workflows/job-test-linux-ubuntu.yml b/.github/workflows/job-test-linux-ubuntu.yml
index cf781572a..44b3036ce 100644
--- a/.github/workflows/job-test-linux-ubuntu.yml
+++ b/.github/workflows/job-test-linux-ubuntu.yml
@@ -17,6 +17,7 @@ jobs:
         include:
           - distro: ubuntu20.04
           - distro: ubuntu19.10
+          - distro: ubuntu21.04
 #          - distro: ubuntu18.04 #Need to install git 2.18+
 #          - distro: ubuntu16.04 #Need to install git 2.18+
 
diff --git a/ChangeLog b/ChangeLog
index 23d39cfd8..fc57a3f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ Bug fixes:
 Enhancements:
 - #6998 Remove functionality related to the screen saver synchronisation
 - #7026 Update the way we package OpenSSL for Windows build
+- #7037 Add Ubuntu 21.04 build
 ===========
 
 v1.14.0-stable
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 09216f164..5cf97134b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,7 +6,7 @@ jobs:
 
   - job: Linux
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
 
     strategy:
       matrix:
@@ -27,6 +27,10 @@ jobs:
           image: symless/synergy-core:ubuntu20.04
           packager: deb
           name: ubuntu20
+        ubuntu2104:
+          image: symless/synergy-core:ubuntu21.04
+          packager: deb
+          name: ubuntu21
         debian9:
           image: symless/synergy-core:debian9
           packager: deb