diff --git a/.gitignore b/.gitignore
index e0522c2..a194474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,3 @@
 /cachelib-2023.10.09.00.tar.gz
 /cachelib-2023.10.16.00.tar.gz
 /cachelib-2024.01.22.00.tar.gz
-/cachelib-2024.02.19.00.tar.gz
-/cachelib-2024.07.22.00.tar.gz
-/cachelib-2024.08.19.00.tar.gz
-/cachelib-2025.02.03.00.tar.gz
diff --git a/cachelib-disable-binary_trace_gen.diff b/cachelib-disable-binary_trace_gen.diff
deleted file mode 100644
index 84b8cee..0000000
--- a/cachelib-disable-binary_trace_gen.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/cachelib/cachebench/CMakeLists.txt
-+++ b/cachelib/cachebench/CMakeLists.txt
-@@ -41,25 +41,6 @@ target_link_libraries(cachelib_cachebenc
-   gflags
- )
- 
--add_library (cachelib_binary_trace_gen
--  ./runner/Runner.cpp
--  ./runner/Stressor.cpp
--  ./util/CacheConfig.cpp
--  ./util/Config.cpp
--  ./workload/BlockChunkCache.cpp
--  ./workload/BlockChunkReplayGenerator.cpp
--  ./workload/PieceWiseCache.cpp
--  ./workload/OnlineGenerator.cpp
--  ./workload/WorkloadGenerator.cpp
--  ./workload/PieceWiseReplayGenerator.cpp
--  )
--add_dependencies(cachelib_binary_trace_gen thrift_generated_files)
--target_link_libraries(cachelib_binary_trace_gen PUBLIC
--  cachelib_datatype
--  cachelib_allocator
--  gflags
--)
--
- if ((CMAKE_SYSTEM_NAME STREQUAL Linux) AND
-     (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64))
- else()
-@@ -68,14 +49,11 @@ endif()
- 
- 
- add_executable (cachebench main.cpp)
--add_executable (binary_trace_gen binary_trace_gen.cpp)
- target_link_libraries(cachebench cachelib_cachebench)
--target_link_libraries(binary_trace_gen cachelib_binary_trace_gen)
- 
- install(
-   TARGETS
-      cachebench
--     binary_trace_gen
-   DESTINATION ${BIN_INSTALL_DIR}
- )
- 
diff --git a/cachelib-fix-DeviceTest-FDP.diff b/cachelib-fix-DeviceTest-FDP.diff
deleted file mode 100644
index 424b24c..0000000
--- a/cachelib-fix-DeviceTest-FDP.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cachelib/navy/CMakeLists.txt
-+++ b/cachelib/navy/CMakeLists.txt
-@@ -105,7 +105,7 @@ if (BUILD_TESTS)
-   add_test (scheduler/tests/ThreadPoolJobSchedulerTest.cpp)
-   add_test (driver/tests/DriverTest.cpp)
-   if (NOT MISSING_FALLOCATE)
--    add_test (common/tests/DeviceTest.cpp)
-+#    add_test (common/tests/DeviceTest.cpp)
-   endif()
-   add_test (block_cache/tests/AllocatorTest.cpp)
-   add_test (block_cache/tests/RegionManagerTest.cpp)
diff --git a/cachelib.spec b/cachelib.spec
index 28eedaf..fd62a4d 100644
--- a/cachelib.spec
+++ b/cachelib.spec
@@ -9,7 +9,7 @@
 %bcond_with check
 
 %global forgeurl https://github.com/facebook/CacheLib
-%global tag 2025.02.03.00
+%global tag 2024.01.22.00
 %global date %(echo %{tag} | sed -e 's|.00$||' | sed -e 's|\\.||g')
 # disable forge macro snapinfo generation
 # https://pagure.io/fedora-infra/rpmautospec/issue/240
@@ -26,11 +26,7 @@ Summary:        Pluggable caching engine for scale high performance cache servic
 
 License:        Apache-2.0
 URL:            %forgeurl
-Source:         %{url}/archive/v%{tag}/%{name}-%{tag}.tar.gz
-# DeviceTest needs common/FdpNvme.cpp. Disable for now
-Patch:          %{name}-fix-DeviceTest-FDP.diff
-# incomplete dependencies, will sort out later
-Patch:          %{name}-disable-binary_trace_gen.diff
+Source0:        %{url}/archive/v%{tag}/%{name}-%{tag}.tar.gz
 # needed on EL8; its gtest does not come with cmake files
 Patch100:       %{name}-find-gtest.patch
 # Workaround for gcc issue (still needed on epel9 x86_64)
diff --git a/series b/series
index e1b4b30..cd0f15d 100644
--- a/series
+++ b/series
@@ -1,2 +1,2 @@
-cachelib-fix-DeviceTest-FDP.diff
-cachelib-disable-binary_trace_gen.diff
+cachelib-find-gtest.patch
+cachelib-workaround-gcc-epel9-x86_64-bz2108665.patch
diff --git a/sources b/sources
index 6d89fce..e01fd4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cachelib-2025.02.03.00.tar.gz) = 439e4941ed0ab42916342d8e702c31def0ae36ef52153ebac9d6b8bb26e9a9cef677ba1352ec5ffb4b962db8cca54151cde534c54e4427df2820a63ffb862ecd
+SHA512 (cachelib-2024.01.22.00.tar.gz) = 9f58568f379a2f28f44526055820c75010af79cf65b8a800182ea3d218a0a158ffab9d9e93f9dcd07c5febc06bf74f4c92e15d26c26f4ef9cf6dc933bc3ec87d