diff --git a/builder/core/data.py b/builder/core/data.py
index 5f03eadca..61878445e 100644
--- a/builder/core/data.py
+++ b/builder/core/data.py
@@ -541,15 +541,49 @@ class PKG_TOOLS(Enum):
                 'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
                 'apt_compiler_packages': ['libstdc++-9-dev'],
             },
-            '10': {},
-            '11': {},
-            '12': {},
-            '13': {},
-            '14': {},
-            '15': {},
-            '16': {},
-            '17': {},
-            '18': {},
+            '10': {
+                'c': "clang-10",
+                'cxx': "clang++-10",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-10-dev'],
+            },
+            '11': {
+                'c': "clang-11",
+                'cxx': "clang++-11",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-11-dev'],
+            },
+            '12': {
+                'c': "clang-12",
+                'cxx': "clang++-12",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-12-dev'],
+            },
+            '13': {
+                'c': "clang-13",
+                'cxx': "clang++-13",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libstdc++-13-dev'],
+            },
+            '14': {
+                'c': "clang-14",
+                'cxx': "clang++-14",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libc++abi-14-dev'],
+            },
+            '15': {
+                'c': "clang-15",
+                'cxx': "clang++-15",
+                'cmake_args': ['-DENABLE_FUZZ_TESTS=ON'],
+                'apt_compiler_packages': ['libc++abi-15-dev'],
+            },
+            # Those version are not found. We can try to install from source. But, skip for now.
+            '16': {
+            },
+            '17': {
+            },
+            '18': {
+            },
         },
         'architectures': {
             # No fuzz tests on ARM
diff --git a/builder/main.py b/builder/main.py
index 61beb82f6..cef66dc56 100755
--- a/builder/main.py
+++ b/builder/main.py
@@ -242,7 +242,7 @@ def upload_test_coverage(env):
         token = env.shell.get_secret("codecov-token", env.project.name)
     except:
         print(f"No token found for {env.project.name}, check https://app.codecov.io/github/awslabs/{env.project.name}/settings for token and add it to codecov-token in secret-manager.", file=sys.stderr)
-        exit()
+        sys.exit(1)
     # only works for linux for now
     env.shell.exec('curl', '-Os', 'https://uploader.codecov.io/latest/linux/codecov', check=True)
     env.shell.exec('chmod', '+x', 'codecov', check=True)