diff --git a/.github/workflows/ci-linux-arm64.yml b/.github/workflows/ci-linux-arm64.yml
index 1666b9760..249928f37 100644
--- a/.github/workflows/ci-linux-arm64.yml
+++ b/.github/workflows/ci-linux-arm64.yml
@@ -2,7 +2,7 @@ name: CI (Linux arm64)
 on: [push, pull_request]
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
       with:
diff --git a/.github/workflows/ci-linux-armhf.yml b/.github/workflows/ci-linux-armhf.yml
index 50858959f..6e37781b7 100644
--- a/.github/workflows/ci-linux-armhf.yml
+++ b/.github/workflows/ci-linux-armhf.yml
@@ -2,7 +2,7 @@ name: CI (Linux armhf)
 on: [push, pull_request]
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
       with:
diff --git a/Makefile b/Makefile
index e0c693505..7b9ac5ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -475,12 +475,8 @@ target_: $(TARGET)
 
 $(TARGET): $(OBJS)
 ifeq ($(PARTIAL_LINKING), 1)
-	$(LD) -o $(basename $(TARGET))1.o -r --gc-sections \
-		$(addprefix -u ,$(shell cat frontend/libretro-extern)) \
-		$(addprefix -u ,$(EXTRA_EXTERN_SYMS)) $^
-	$(OBJCOPY) --keep-global-symbols=frontend/libretro-extern \
-		$(addprefix -G ,$(EXTRA_EXTERN_SYMS)) \
-		$(basename $(TARGET))1.o $(basename $(TARGET)).o
+	$(LD) -o $(basename $(TARGET))1.o -r --gc-sections $(addprefix -u ,$(shell cat frontend/libretro-extern)) $(addprefix -u ,$(EXTRA_EXTERN_SYMS)) $^
+	$(OBJCOPY) --keep-global-symbols=frontend/libretro-extern $(addprefix -G ,$(EXTRA_EXTERN_SYMS)) $(basename $(TARGET))1.o $(basename $(TARGET)).o
 	$(AR) rcs $@ $(basename $(TARGET)).o
 else ifeq ($(STATIC_LINKING), 1)
 	$(AR) rcs $@ $^
diff --git a/libpcsxcore/database.c b/libpcsxcore/database.c
index 8e2a31ad3..cf2a16aab 100644
--- a/libpcsxcore/database.c
+++ b/libpcsxcore/database.c
@@ -157,6 +157,12 @@ cycle_multiplier_overrides[] =
 	{ 200, { "SLUS01519", "SCPS45260", "SLPS01463" } },
 };
 
+static const char * const lightrec_hack_db[] =
+{
+	/* Tomb Raider (Rev 2) - boot menu clears over itself */
+	"SLUS00152",
+};
+
 /* Function for automatic patching according to GameID. */
 void Apply_Hacks_Cdrom(void)
 {
@@ -221,6 +227,9 @@ void Apply_Hacks_Cdrom(void)
 		lightrec_hacks = 0;
 		if (Config.hacks.f1)
 			lightrec_hacks |= LIGHTREC_HACK_INV_DMA_ONLY;
+		for (i = 0; i < ARRAY_SIZE(lightrec_hack_db); i++)
+			if (strcmp(lightrec_hack_db[i], CdromId) == 0)
+				lightrec_hacks |= LIGHTREC_HACK_INV_DMA_ONLY;
 		if (lightrec_hacks)
 			SysPrintf("using lightrec_hacks: 0x%x\n", lightrec_hacks);
 	}