diff --git a/.dockerignore b/.dockerignore
index 8a95e5f..5f7d71e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,3 +4,7 @@ Dockerfile
 /.github/
 *.md
 LICENSE
+/patches/README.md
+/patches/LICENSE
+/patches/.git/
+
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index f4460c5..e056f73 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,5 +1,7 @@
 name: ci
 # See https://docs.docker.com/build/ci/github-actions/examples
+env:
+  DOCKER_BUILDKIT: 1
 
 on:
   schedule:
@@ -38,6 +40,8 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
       -
         name: Login to Docker Hub
         if: github.event_name != 'pull_request'
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c51db87
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "patches"]
+	path = patches
+	url = https://github.com/ParaToolsInc/salt-llvm-patches.git
diff --git a/Dockerfile b/Dockerfile
index a57dd76..c2cb54a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,7 +97,6 @@ RUN --mount=type=cache,target=/ccache/ <<EOC
     -DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" \
-    -DLLVM_TARGETS_TO_BUILD=X86 \
     -S /llvm-project/llvm -B /llvm-project/llvm/build
 
   # Build libraries, headers, and binaries
@@ -175,3 +174,4 @@ RUN --mount=type=cache,target=/home/salt/ccache <<EOC
 EOC
 
 ENV PATH="${PATH}:/usr/local/x86_64/bin"
+RUN alias ls="ls --color=auto"
diff --git a/README.md b/README.md
index cf2565f..e18f450 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,10 @@ Container definitions for [SALT] development.
 
 This repository defines and deploys the containers used for [SALT] continuous integration (CI) and local development.
 
+LLVM/Clang patches needed by [SALT] for minimal LLVM/Clang builds are shared between this repository
+and [SALT] using a [git submodule].
+The patches are stored here: https://github.com/ParaToolsInc/salt-llvm-patches
+
 ## Building the development container for local use
 
 First, BuildKit, caching and intelligent layer creation and ordering have been employed
@@ -82,3 +86,4 @@ Very useful examples are available [here](https://docs.docker.com/build/ci/githu
 
 
 [SALT]: https://github.com/ParaToolsInc/salt
+[git submodule]: https://git-scm.com/book/en/v2/Git-Tools-Submodules
diff --git a/patches b/patches
new file mode 160000
index 0000000..a82afb3
--- /dev/null
+++ b/patches
@@ -0,0 +1 @@
+Subproject commit a82afb3acb5f214e7aa7a043d1577e2fe7719e1a
diff --git a/patches/ClangTargets.cmake.patch b/patches/ClangTargets.cmake.patch
deleted file mode 100644
index efdae38..0000000
--- a/patches/ClangTargets.cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/llvm/lib/cmake/clang/ClangTargets.cmake        2022-11-04 14:48:01.627471510 +0000
-+++ /tmp/llvm/lib/cmake/clang/ClangTargets.cmake.b      2022-11-04 14:57:45.345397332 +0000
-@@ -710,7 +710,7 @@
- foreach(target ${_IMPORT_CHECK_TARGETS} )
-   foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-     if(NOT EXISTS "${file}" )
--      message(FATAL_ERROR "The imported target \"${target}\" references the file
-+      message(DEBUG "The imported target \"${target}\" references the file
-    \"${file}\"
- but this file does not exist.  Possible reasons include:
- * The file was deleted, renamed, or moved to another location.
diff --git a/patches/LLVMExports.cmake.patch b/patches/LLVMExports.cmake.patch
deleted file mode 100644
index 760bb2e..0000000
--- a/patches/LLVMExports.cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/llvm/lib/cmake/llvm/LLVMExports.cmake  2022-11-04 14:15:29.967057438 +0000
-+++ /tmp/llvm/lib/cmake/llvm/LLVMExports.cmake.b        2022-11-04 13:55:14.935207352 +0000
-@@ -825,7 +825,7 @@
- foreach(target ${_IMPORT_CHECK_TARGETS} )
-   foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
-     if(NOT EXISTS "${file}" )
--      message(FATAL_ERROR "The imported target \"${target}\" references the file
-+      message(DEBUG "The imported target \"${target}\" references the file
-    \"${file}\"
- but this file does not exist.  Possible reasons include:
- * The file was deleted, renamed, or moved to another location.