diff --git a/common/.gitmodules b/common/.gitmodules
index 3a3d7f7f3..363485649 100644
--- a/common/.gitmodules
+++ b/common/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "thirdparty/spdlog"]
 	path = thirdparty/spdlog
 	url = https://github.com/gabime/spdlog.git
-[submodule "thirdparty/criterion"]
-	path = thirdparty/criterion
-	url = https://github.com/Snaipe/Criterion.git
diff --git a/common/Dockerfile b/common/Dockerfile
index 13c8f301e..7283a89b8 100644
--- a/common/Dockerfile
+++ b/common/Dockerfile
@@ -63,8 +63,11 @@ RUN dnf -y install \
 	openssl-devel openssl
 
 # Build & Install Criterion
-COPY thirdparty/criterion /tmp/criterion
-RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake .. && make install && rm -rf /tmp/*
+RUN cd /tmp && \
+	git clone --recursive https://github.com/Snaipe/Criterion && \
+	mkdir -p Criterion/build && cd Criterion/build && \
+	cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \
+	rm -rf /tmp/*
 
 ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64
 
diff --git a/common/thirdparty/criterion b/common/thirdparty/criterion
deleted file mode 160000
index 9b7036582..000000000
--- a/common/thirdparty/criterion
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9b70365825aced7333d7867bb5c64c63919ce510