diff --git a/.gitmodules b/.gitmodules
index be2a4d3..a718df8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,6 +40,6 @@
 [submodule "third-deps/sregex"]
 	path = third-deps/sregex
 	url = https://github.com/openresty/sregex.git
-[submodule "modules/zstd-nginx-module"]
-	path = modules/zstd-nginx-module
-	url = https://github.com/tokers/zstd-nginx-module.git
+[submodule "modules/ModSecurity-nginx"]
+	path = modules/ModSecurity-nginx
+	url = https://github.com/owasp-modsecurity/ModSecurity-nginx.git
diff --git a/Dockerfile b/Dockerfile
index 13b603c..11ec900 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,8 @@ RUN set -ex \
         curl \
         libssl-dev \
         libpcre3-dev \
-        zlib1g-dev 
+        zlib1g-dev \
+        libmodsecurity-dev
 
 # install build dependencies for additional dynamic modules
 RUN set -ex \
@@ -69,7 +70,7 @@ RUN set -ex \
         --add-dynamic-module=/usr/src/modules/headers-more-nginx-module \
         --add-dynamic-module=/usr/src/modules/ngx_devel_kit \
         --add-dynamic-module=/usr/src/modules/iconv-nginx-module \
-        --add-dynamic-module=/usr/src/modules/zstd-nginx-module \
+        --add-dynamic-module=/usr/src/modules/ModSecurity-nginx \
         | bash -x \
 # build modules
     && make modules -j$(nproc) \
@@ -129,4 +130,6 @@ RUN set -ex \
         libxslt1.1 \
         libmaxminddb0 \
         libzstd1 \
+        libmodsecurity3 \
+        modsecurity-crs \
     && rm -rf /var/lib/apt/lists/*
diff --git a/modules/ModSecurity-nginx b/modules/ModSecurity-nginx
new file mode 160000
index 0000000..ef64996
--- /dev/null
+++ b/modules/ModSecurity-nginx
@@ -0,0 +1 @@
+Subproject commit ef64996aedd4bb5fa1831631361244813d48b82f
diff --git a/modules/zstd-nginx-module b/modules/zstd-nginx-module
deleted file mode 160000
index f4ba115..0000000
--- a/modules/zstd-nginx-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f4ba115e0b0eaecde545e5f37db6aa18917d8f4b