diff --git a/debian/patches/include-utility-header.patch b/debian/patches/include-utility-header.patch
index 1c021ee..ea20b69 100644
--- a/debian/patches/include-utility-header.patch
+++ b/debian/patches/include-utility-header.patch
@@ -4,10 +4,10 @@ Description: Include <utility> header
  https://github.com/boostorg/asio/commit/71964b22c7fade69cc4caa1c869a868e3a32cc97
 Author: Andrea Pappacoda <andrea@pappacoda.it>
 Forwarded: not-needed
-Last-Update: 2022-09-22
+Last-Update: 2023-01-23
 
---- yuzu-0-1176+ds.orig/src/core/debugger/debugger.cpp
-+++ yuzu-0-1176+ds/src/core/debugger/debugger.cpp
+--- yuzu-0-1317+ds.orig/src/core/debugger/debugger.cpp
++++ yuzu-0-1317+ds/src/core/debugger/debugger.cpp
 @@ -4,6 +4,7 @@
  #include <algorithm>
  #include <mutex>
@@ -16,18 +16,18 @@ Last-Update: 2022-09-22
  
  #include <boost/asio.hpp>
  #include <boost/process/async_pipe.hpp>
---- yuzu-0-1176+ds.orig/src/core/file_sys/bis_factory.cpp
-+++ yuzu-0-1176+ds/src/core/file_sys/bis_factory.cpp
-@@ -2,6 +2,7 @@
+--- yuzu-0-1317+ds.orig/src/core/file_sys/bis_factory.cpp
++++ yuzu-0-1317+ds/src/core/file_sys/bis_factory.cpp
+@@ -1,6 +1,7 @@
+ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
  // SPDX-License-Identifier: GPL-2.0-or-later
  
- #include <fmt/format.h>
 +#include <utility>
+ #include <fmt/format.h>
  #include "common/fs/path_util.h"
  #include "core/file_sys/bis_factory.h"
- #include "core/file_sys/mode.h"
---- yuzu-0-1176+ds.orig/src/input_common/drivers/udp_client.cpp
-+++ yuzu-0-1176+ds/src/input_common/drivers/udp_client.cpp
+--- yuzu-0-1317+ds.orig/src/input_common/drivers/udp_client.cpp
++++ yuzu-0-1317+ds/src/input_common/drivers/udp_client.cpp
 @@ -2,6 +2,7 @@
  // SPDX-License-Identifier: GPL-2.0-or-later
  
@@ -36,8 +36,8 @@ Last-Update: 2022-09-22
  #include <boost/asio.hpp>
  #include <fmt/format.h>
  
---- yuzu-0-1176+ds.orig/src/tests/input_common/calibration_configuration_job.cpp
-+++ yuzu-0-1176+ds/src/tests/input_common/calibration_configuration_job.cpp
+--- yuzu-0-1317+ds.orig/src/tests/input_common/calibration_configuration_job.cpp
++++ yuzu-0-1317+ds/src/tests/input_common/calibration_configuration_job.cpp
 @@ -4,6 +4,7 @@
  #include <array>
  #include <string>
diff --git a/debian/patches/revert-catch2-v3.patch b/debian/patches/revert-catch2-v3.patch
new file mode 100644
index 0000000..8d49507
--- /dev/null
+++ b/debian/patches/revert-catch2-v3.patch
@@ -0,0 +1,164 @@
+Description: Revert Catch2 v3 switch
+ Debian won't be packaging Catch2 version 3 for the time being,
+ according to
+ <https://salsa.debian.org/debian/catch2/-/commit/73c03e2f9d8be0959cc097366ac1241773fe20da>.
+ I think that's a shame, but whatever. This patch reverts upstream
+ commit d0fe27708edf976f1aad25064a2dcdc6cb887ec1
+Author: Andrea Pappacoda <andrea@pappacoda.it>
+Forwarded: not-needed
+Last-Update: 2023-01-23
+
+--- yuzu-0-1317+ds.orig/CMakeLists.txt
++++ yuzu-0-1317+ds/CMakeLists.txt
+@@ -244,7 +244,7 @@ if (ENABLE_WEB_SERVICE)
+ endif()
+ 
+ if (YUZU_TESTS)
+-    find_package(Catch2 3.0.1 REQUIRED)
++    find_package(Catch2 2.13 REQUIRED)
+ endif()
+ 
+ find_package(Boost 1.73.0 COMPONENTS context)
+--- yuzu-0-1317+ds.orig/src/tests/common/bit_field.cpp
++++ yuzu-0-1317+ds/src/tests/common/bit_field.cpp
+@@ -4,7 +4,7 @@
+ #include <array>
+ #include <cstring>
+ #include <type_traits>
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ #include "common/bit_field.h"
+ 
+ TEST_CASE("BitField", "[common]") {
+--- yuzu-0-1317+ds.orig/src/tests/common/cityhash.cpp
++++ yuzu-0-1317+ds/src/tests/common/cityhash.cpp
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "common/cityhash.h"
+ 
+--- yuzu-0-1317+ds.orig/src/tests/common/fibers.cpp
++++ yuzu-0-1317+ds/src/tests/common/fibers.cpp
+@@ -11,7 +11,7 @@
+ #include <unordered_map>
+ #include <vector>
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "common/common_types.h"
+ #include "common/fiber.h"
+--- yuzu-0-1317+ds.orig/src/tests/common/host_memory.cpp
++++ yuzu-0-1317+ds/src/tests/common/host_memory.cpp
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "common/host_memory.h"
+ #include "common/literals.h"
+--- yuzu-0-1317+ds.orig/src/tests/common/param_package.cpp
++++ yuzu-0-1317+ds/src/tests/common/param_package.cpp
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: 2017 Citra Emulator Project
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ #include <math.h>
+ #include "common/logging/backend.h"
+ #include "common/param_package.h"
+--- yuzu-0-1317+ds.orig/src/tests/common/range_map.cpp
++++ yuzu-0-1317+ds/src/tests/common/range_map.cpp
+@@ -3,7 +3,7 @@
+ 
+ #include <stdexcept>
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "common/range_map.h"
+ 
+--- yuzu-0-1317+ds.orig/src/tests/common/ring_buffer.cpp
++++ yuzu-0-1317+ds/src/tests/common/ring_buffer.cpp
+@@ -7,7 +7,7 @@
+ #include <numeric>
+ #include <thread>
+ #include <vector>
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ #include "common/ring_buffer.h"
+ 
+ namespace Common {
+--- yuzu-0-1317+ds.orig/src/tests/common/scratch_buffer.cpp
++++ yuzu-0-1317+ds/src/tests/common/scratch_buffer.cpp
+@@ -5,7 +5,7 @@
+ #include <array>
+ #include <cstring>
+ #include <span>
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ #include "common/common_types.h"
+ #include "common/scratch_buffer.h"
+ 
+--- yuzu-0-1317+ds.orig/src/tests/common/unique_function.cpp
++++ yuzu-0-1317+ds/src/tests/common/unique_function.cpp
+@@ -3,7 +3,7 @@
+ 
+ #include <string>
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "common/unique_function.h"
+ 
+--- yuzu-0-1317+ds.orig/src/tests/core/core_timing.cpp
++++ yuzu-0-1317+ds/src/tests/core/core_timing.cpp
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: 2016 Dolphin Emulator Project
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include <array>
+ #include <bitset>
+--- yuzu-0-1317+ds.orig/src/tests/core/internal_network/network.cpp
++++ yuzu-0-1317+ds/src/tests/core/internal_network/network.cpp
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "core/internal_network/network.h"
+ #include "core/internal_network/sockets.h"
+--- yuzu-0-1317+ds.orig/src/tests/input_common/calibration_configuration_job.cpp
++++ yuzu-0-1317+ds/src/tests/input_common/calibration_configuration_job.cpp
+@@ -6,7 +6,7 @@
+ #include <thread>
+ #include <boost/asio.hpp>
+ #include <boost/crc.hpp>
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "input_common/drivers/udp_client.h"
+ #include "input_common/helpers/udp_protocol.h"
+--- yuzu-0-1317+ds.orig/src/tests/video_core/buffer_base.cpp
++++ yuzu-0-1317+ds/src/tests/video_core/buffer_base.cpp
+@@ -4,7 +4,7 @@
+ #include <stdexcept>
+ #include <unordered_map>
+ 
+-#include <catch2/catch_test_macros.hpp>
++#include <catch2/catch.hpp>
+ 
+ #include "common/alignment.h"
+ #include "common/common_types.h"
diff --git a/debian/patches/series b/debian/patches/series
index eb83550..8d5c04a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,6 @@ cmake-mbedtls.patch
 #cmake-microprofile.patch
 # Debian-specific patches
 debian-git-revision.patch
-include-utility-header.patch
 revert-vulkan-1.3.238.patch
+revert-catch2-v3.patch
+include-utility-header.patch