diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1366b1c..9cd8ccb 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -11,7 +11,7 @@ jobs:
     name: Unit Tests
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -19,6 +19,10 @@ jobs:
       with:
         submodules: recursive
 
+    - name: Install uuid-dev on Ubuntu
+      if: runner.os == 'Linux'
+      run: sudo apt-get update && sudo apt-get install -y uuid-dev
+
     - name: Run tests
       run: ./run_test.sh
       shell: bash
diff --git a/.gitmodules b/.gitmodules
index 162b883..5faef87 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "third-party/catch2"]
 	path = third-party/catch2
-	url = https://github.com/duckduckgo/Catch2.git
+	url = https://github.com/catchorg/Catch2.git
diff --git a/third-party/catch2 b/third-party/catch2
index 87074da..182c910 160000
--- a/third-party/catch2
+++ b/third-party/catch2
@@ -1 +1 @@
-Subproject commit 87074da73ecb1c2e7c35fd14f50ca21c4c002adc
+Subproject commit 182c910b4b63ff587a3440e08f84f70497e49a81