diff --git a/.github/workflows/vcpkg_ci_amd64.yml b/.github/workflows/vcpkg_ci_amd64.yml
index 1b23b4b2..0d7b6dd6 100644
--- a/.github/workflows/vcpkg_ci_amd64.yml
+++ b/.github/workflows/vcpkg_ci_amd64.yml
@@ -207,7 +207,6 @@ jobs:
       - name: 'Remill build'
         shell: 'bash'
         working-directory: remill
-        if: contains(matrix.llvm, 'llvm-15')
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -222,7 +221,6 @@ jobs:
       - name: 'Remill test'
         shell: 'bash'
         working-directory: remill/build
-        if: contains(matrix.llvm, 'llvm-15')
         run: |
           # Some tests fail on ubuntu 22.04
           env CTEST_OUTPUT_ON_FAILURE=1 ctest . || true
@@ -246,10 +244,12 @@ jobs:
             -S . -B build
           cmake --build build
           cmake --install build
+      # NOTE: This is an old test that doesn't make sense anymore
+      # Need to find some other way to run a smoketest
       #- name: 'Anvill test'
       #  shell: 'bash'
-      #  working-directory: anvill/build
-      #  # if: matrix.target_arch == 'x64'
+      #  working-directory: anvill
+      #  if: contains(matrix.llvm, 'llvm-15')
       #  run: |
       #    ./install/bin/anvill-decompile-spec --spec ../bin/Decompile/tests/specs/ret0.json --bc_out ./ret0.bc --ir_out ret0.ir
 
diff --git a/.github/workflows/vcpkg_ci_mac.yml b/.github/workflows/vcpkg_ci_mac.yml
index 57d95ad5..14566355 100644
--- a/.github/workflows/vcpkg_ci_mac.yml
+++ b/.github/workflows/vcpkg_ci_mac.yml
@@ -205,7 +205,7 @@ jobs:
       - name: 'Remill build'
         shell: 'bash'
         working-directory: remill
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        if: matrix.target_arch == 'x64'
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -221,7 +221,7 @@ jobs:
       - name: 'Remill test'
         shell: 'bash'
         working-directory: remill/build
-        if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+        if: matrix.target_arch == 'x64'
         run: |
           # Only run test on x64
           env CTEST_OUTPUT_ON_FAILURE=1 ctest .
@@ -247,12 +247,15 @@ jobs:
           cmake --build build
           cmake --install build
 
+      # NOTE: This is an old test that doesn't make sense anymore
+      # Need to find some other way to run a smoketest
       #- name: 'Anvill test'
       #  shell: 'bash'
-      #  working-directory: anvill/build
-      #  if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+      #  working-directory: anvill
+      #  # if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
+      #  if: matrix.target_arch == 'x64'
       #  run: |
-      #    ./install/bin/anvill-decompile-json -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir
+      #    ./install/bin/anvill-decompile-spec -spec ../bin/Decompile/tests/specs/ret0.json -bc_out ./ret0.bc -ir_out ret0.ir
 
       - name: Cache cleanup and reporting
         shell: 'bash'
diff --git a/.github/workflows/vcpkg_ci_windows.yml b/.github/workflows/vcpkg_ci_windows.yml
index f9f8505c..2d5ee902 100644
--- a/.github/workflows/vcpkg_ci_windows.yml
+++ b/.github/workflows/vcpkg_ci_windows.yml
@@ -155,7 +155,6 @@ jobs:
           # python ../scripts/roundtrip.py ( Get-ChildItem tools | Where-Object {$_.name -match "rellic-decomp.exe"} ) ..\tests\tools\decomp "${env:VCPKG_ROOT}\installed\${env:TRIPLET}\tools\${{ matrix.llvm }}\clang.exe"
 
       - name: 'Test remill build'
-        if: ${{ matrix.llvm == 'llvm-15' }}
         run: |
           cd remill
           Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build
diff --git a/remill b/remill
index 66832ffe..8dbd5d94 160000
--- a/remill
+++ b/remill
@@ -1 +1 @@
-Subproject commit 66832ffeaeb6568bd66db289db4045f7479a12b8
+Subproject commit 8dbd5d947df969d644ec8b4ad6d6d53370264d49