diff --git a/.github/workflows/non_vendored.yml b/.github/workflows/non_vendored.yml
index 8cc8767cac..de114fc720 100644
--- a/.github/workflows/non_vendored.yml
+++ b/.github/workflows/non_vendored.yml
@@ -58,7 +58,7 @@ jobs:
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DJSON_BuildTests=OFF . && cmake --build build && sudo cmake --install build
         popd
 
-        git clone --depth 1 --branch v1.83 https://github.com/chipsalliance/UHDM.git
+        git clone --depth 1 --branch v1.84 https://github.com/chipsalliance/UHDM.git
         pushd UHDM
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DUHDM_USE_HOST_GTEST=ON -DUHDM_USE_HOST_CAPNP=ON . && cmake --build build && sudo cmake --install build
         popd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ceefb5496..70f45cda92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # Version changes whenever some new features accumulated, or the
 # grammar or the cache format changes to make sure caches
 # are invalidated.
-project(SURELOG VERSION 1.83)
+project(SURELOG VERSION 1.84)
 
 # Detect build type, fallback to release and throw a warning if use didn't
 # specify any
diff --git a/third_party/UHDM b/third_party/UHDM
index cdba7aa9c4..af8bb5e7b4 160000
--- a/third_party/UHDM
+++ b/third_party/UHDM
@@ -1 +1 @@
-Subproject commit cdba7aa9c43f7791240b1bc4f0a50536790be5c0
+Subproject commit af8bb5e7b456811d64a7bc647d52410b66a953ca