diff --git a/.gitmodules b/.gitmodules
index 67b02c98..16da7e03 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,6 +11,3 @@
 [submodule "compression/bitshuffle_hperf"]
 	path = compression/bitshuffle_hperf
 	url = https://github.com/kalcutter/bitshuffle
-[submodule "broker/pistache"]
-	path = broker/pistache
-	url = https://github.com/fleon-psi/pistache
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b64f850a..7ea1b746 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,13 +39,22 @@ FIND_LIBRARY(NUMA_LIBRARY NAMES numa DOC "NUMA Library")
 CHECK_INCLUDE_FILE(numaif.h HAS_NUMAIF)
 CHECK_INCLUDE_FILE(numa.h HAS_NUMA_H)
 
+include(FetchContent)
+
+FetchContent_Declare(
+        pistache_http
+        GIT_REPOSITORY https://github.com/fleon-psi/pistache
+        GIT_TAG       51553b92cc7bb25ac792462722ddd4fae33d14b1
+)
+
+FetchContent_MakeAvailable(pistache_http)
+
 ADD_SUBDIRECTORY(jungfrau)
 ADD_SUBDIRECTORY(compression)
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(writer)
 ADD_SUBDIRECTORY(frame_serialize)
 
-ADD_SUBDIRECTORY(broker/pistache)
 ADD_SUBDIRECTORY(detector_control)
 IF (JFJOCH_WRITER_ONLY)
     MESSAGE(STATUS "Compiling HDF5 writer only")
diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt
index b06cde1d..250abfdb 100644
--- a/broker/CMakeLists.txt
+++ b/broker/CMakeLists.txt
@@ -1,4 +1,5 @@
 AUX_SOURCE_DIRECTORY(gen/model MODEL_SOURCES)
+
 ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES} gen/api/DefaultApi.cpp gen/api/DefaultApi.h)
 
 TARGET_LINK_LIBRARIES(JFJochAPI pistache_static)
@@ -15,5 +16,3 @@ ADD_EXECUTABLE(jfjoch_broker jfjoch_broker.cpp)
 TARGET_LINK_LIBRARIES(jfjoch_broker JFJochBroker)
 
 INSTALL(TARGETS jfjoch_broker RUNTIME)
-
-
diff --git a/broker/pistache b/broker/pistache
deleted file mode 160000
index 51553b92..00000000
--- a/broker/pistache
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51553b92cc7bb25ac792462722ddd4fae33d14b1