diff --git a/.github/workflows/test_ubuntu.yml b/.github/workflows/test_ubuntu.yml
index 9a4348ca6b..09af31e533 100644
--- a/.github/workflows/test_ubuntu.yml
+++ b/.github/workflows/test_ubuntu.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-21.10]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/Unreal/Plugins/AirSim/Source/AirSim.Build.cs b/Unreal/Plugins/AirSim/Source/AirSim.Build.cs
index 17024a35b6..22958a1964 100644
--- a/Unreal/Plugins/AirSim/Source/AirSim.Build.cs
+++ b/Unreal/Plugins/AirSim/Source/AirSim.Build.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using UnrealBuildTool;
+using System;
 using System.IO;
 
 public class AirSim : ModuleRules
@@ -104,13 +105,6 @@ private void AddOSLibDependencies(ReadOnlyTargetRules Target)
             PublicAdditionalLibraries.Add("dinput8.lib");
             PublicAdditionalLibraries.Add("dxguid.lib");
         }
-
-		if (Target.Platform == UnrealTargetPlatform.Linux)
-		{
-			// needed when packaging
-			PublicAdditionalLibraries.Add("stdc++");
-			PublicAdditionalLibraries.Add("supc++");
-		}
     }
 
     static void CopyFileIfNewer(string srcFilePath, string destFolder)
diff --git a/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h b/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
index 07d6df8944..7320c6479c 100644
--- a/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
+++ b/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
@@ -5,7 +5,7 @@
 #include "common/ImageCaptureBase.hpp"
 #include "common/common_utils/UniqueValueMap.hpp"
 
-class UnrealImageCapture : public msr::airlib::ImageCaptureBase
+class AIRSIM_API UnrealImageCapture : public msr::airlib::ImageCaptureBase
 {
 public:
     typedef msr::airlib::ImageCaptureBase::ImageType ImageType;
diff --git a/build.sh b/build.sh
index 8b45d64ba1..1a8ab5285d 100755
--- a/build.sh
+++ b/build.sh
@@ -67,8 +67,8 @@ else
         export CC="gcc-8"
         export CXX="g++-8"
     else
-        export CC="clang-8"
-        export CXX="clang++-8"
+        export CC="clang-11"
+        export CXX="clang++-11"
     fi
 fi
 
diff --git a/cmake/cmake-modules/CommonSetup.cmake b/cmake/cmake-modules/CommonSetup.cmake
index 11d0c9bcb2..f814b18fca 100644
--- a/cmake/cmake-modules/CommonSetup.cmake
+++ b/cmake/cmake-modules/CommonSetup.cmake
@@ -59,9 +59,9 @@ macro(CommonSetup)
             if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
                 set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wno-documentation -Wno-unknown-warning-option ${CMAKE_CXX_FLAGS}")
                 find_package(LLVM REQUIRED CONFIG)
-                set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -lc++fs -ferror-limit=10")
+                set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -ferror-limit=10")
             else()
-                set(CXX_EXP_LIB "-lstdc++fs -fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
+                set(CXX_EXP_LIB "-fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
             endif ()
         endif ()
 
diff --git a/setup.sh b/setup.sh
index fd0b71e203..1a6c43e0aa 100755
--- a/setup.sh
+++ b/setup.sh
@@ -56,11 +56,11 @@ else #linux
     VERSION=$(lsb_release -rs | cut -d. -f1)
     # Since Ubuntu 17 clang is part of the core repository
     # See https://packages.ubuntu.com/search?keywords=clang-8
-    if [ "$VERSION" -lt "17" ]; then
-        wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo apt-get update
-    fi
-    sudo apt-get install -y clang-8 clang++-8 libc++-8-dev libc++abi-8-dev
+    # if [ "$VERSION" -lt "17" ]; then
+    #     wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+    #     sudo apt-get update
+    # fi
+    sudo apt-get install -y clang-11 clang++-11 libc++-11-dev libc++abi-11-dev
 fi
 
 if ! which cmake; then