diff --git a/nginx-mainline.yaml b/nginx-mainline.yaml
index cf043efb6dc..95dad367851 100644
--- a/nginx-mainline.yaml
+++ b/nginx-mainline.yaml
@@ -59,8 +59,8 @@ data:
   - name: modules
     items:
       http_geoip: "10"
+      http_headers_more_filter: "10"
       http_image_filter: "10"
-      http_perl: "10"
       http_xslt_filter: "10"
       mail: "10"
       stream_geoip: "10"
@@ -87,6 +87,13 @@ pipeline:
       expected-commit: 5eaf45f11e85459b52c18f876e69320df420ae29
       destination: nginx-mainline
 
+  - uses: git-checkout
+    with:
+      repository: https://github.com/openresty/headers-more-nginx-module.git
+      tag: v0.39
+      expected-commit: 2b1debde426783b8f42246149d3638644a6347cb
+      destination: headers-more-src
+
   - name: configure
     working-directory: nginx-mainline
     runs: |
@@ -139,7 +146,8 @@ pipeline:
           --with-stream_ssl_module \
           --with-stream_realip_module \
           --with-stream_geoip_module=dynamic \
-          --with-stream_ssl_preread_module
+          --with-stream_ssl_preread_module \
+          --add-dynamic-module=../headers-more-src
 
   - working-directory: nginx-mainline
     runs: |
@@ -377,21 +385,22 @@ subpackages:
             rc-service nginx stop
 
   - range: modules
-    name: nginx-mainline-mod-${{range.key}}
+    name: ${{package.name}}-mod-${{range.key}}
     description: Nginx third-party module ${{range.key}}
     dependencies:
       provides:
         - nginx-mod-${{range.key}}=${{package.full-version}}
       runtime:
         - merged-usrsbin
-        - perl-dev
+        - ${{package.name}}
         - wolfi-baselayout
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib/nginx/modules
-          mkdir -p ${{targets.subpkgdir}}/etc/nginx/modules
           # --modules-path is only used for installing modules, not loading them
-          mkdir -p ${{targets.subpkgdir}}/var/lib/nginx/
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
           ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
 
           mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_${{range.key}}_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
@@ -400,13 +409,6 @@ subpackages:
           echo "load_module \"modules/ngx_${{range.key}}_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/${{range.value}}_${{range.key}}.conf
 
           case ${{range.key}} in
-            http_perl)
-              mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
-            ;;
-            http_naxsi)
-              install -m644 -D naxsi-*/naxsi_config/naxsi_core.rules \
-                ${{targets.subpkgdir}}/etc/nginx/naxsi_core.rules
-            ;;
             stream)
               mkdir -p ${{targets.subpkgdir}}/etc/nginx/stream.d
               install -m644 -D stream.conf ${{targets.subpkgdir}}/etc/nginx/stream.d/
@@ -416,6 +418,34 @@ subpackages:
       pipeline:
         - uses: test/tw/ldd-check
 
+  - name: ${{package.name}}-mod-http_perl
+    description: Nginx third-party module http_perl
+    dependencies:
+      provides:
+        - nginx-mod-http_perl=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - ${{package.name}}
+        - perl
+        - wolfi-baselayout
+    pipeline:
+      - runs: |
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
+
+          ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
+
+          mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_perl_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
+
+          mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
+
+          echo "load_module \"modules/ngx_http_perl_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_perl.conf
+    test:
+      pipeline:
+        - uses: test/tw/ldd-check
+
   - name: nginx-mainline-src
     description: Nginx source code
     dependencies:
diff --git a/nginx-stable.yaml b/nginx-stable.yaml
index 746309b7223..2137f4abd34 100644
--- a/nginx-stable.yaml
+++ b/nginx-stable.yaml
@@ -55,8 +55,8 @@ data:
   - name: modules
     items:
       http_geoip: "10"
+      http_headers_more_filter: "10"
       http_image_filter: "10"
-      http_perl: "10"
       http_xslt_filter: "10"
       mail: "10"
       stream_geoip: "10"
@@ -84,6 +84,13 @@ pipeline:
       expected-commit: 9b958b000776c88036cd800c66e7e4ad39e6fd41
       destination: nginx-stable
 
+  - uses: git-checkout
+    with:
+      repository: https://github.com/openresty/headers-more-nginx-module.git
+      tag: v0.39
+      expected-commit: 2b1debde426783b8f42246149d3638644a6347cb
+      destination: headers-more-src
+
   - name: configure
     working-directory: nginx-stable
     runs: |
@@ -138,7 +145,8 @@ pipeline:
           --with-stream_ssl_module \
           --with-stream_realip_module \
           --with-stream_geoip_module=dynamic \
-          --with-stream_ssl_preread_module
+          --with-stream_ssl_preread_module \
+          --add-dynamic-module=../headers-more-src
 
   - working-directory: nginx-stable
     runs: |
@@ -351,14 +359,15 @@ subpackages:
         - nginx-mod-${{range.key}}=${{package.full-version}}
       runtime:
         - merged-usrsbin
-        - perl-dev
+        - ${{package.name}}
         - wolfi-baselayout
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/usr/lib/nginx/modules
-          mkdir -p ${{targets.subpkgdir}}/etc/nginx/modules
           # --modules-path is only used for installing modules, not loading them
-          mkdir -p ${{targets.subpkgdir}}/var/lib/nginx/
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
           ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
 
           mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_${{range.key}}_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
@@ -367,13 +376,6 @@ subpackages:
           echo "load_module \"modules/ngx_${{range.key}}_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/${{range.value}}_${{range.key}}.conf
 
           case ${{range.key}} in
-            http_perl)
-              mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
-            ;;
-            http_naxsi)
-              install -m644 -D naxsi-*/naxsi_config/naxsi_core.rules \
-                ${{targets.subpkgdir}}/etc/nginx/naxsi_core.rules
-            ;;
             stream)
               mkdir -p ${{targets.subpkgdir}}/etc/nginx/stream.d
               install -m644 -D stream.conf ${{targets.subpkgdir}}/etc/nginx/stream.d/
@@ -383,6 +385,34 @@ subpackages:
       pipeline:
         - uses: test/tw/ldd-check
 
+  - name: ${{package.name}}-mod-http_perl
+    description: Nginx third-party module http_perl
+    dependencies:
+      provides:
+        - nginx-mod-http_perl=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - ${{package.name}}
+        - perl
+        - wolfi-baselayout
+    pipeline:
+      - runs: |
+          install -d -m 755 \
+            ${{targets.subpkgdir}}/usr/lib/nginx/modules \
+            ${{targets.subpkgdir}}/etc/nginx/modules \
+            ${{targets.subpkgdir}}/var/lib/nginx
+
+          ln -sf /usr/lib/nginx/modules ${{targets.subpkgdir}}/var/lib/nginx/modules
+
+          mv ${{targets.destdir}}/usr/lib/nginx/modules/ngx_http_perl_module.so ${{targets.subpkgdir}}/usr/lib/nginx/modules/
+
+          mv ${{targets.destdir}}/usr/lib/perl5 ${{targets.subpkgdir}}/usr/lib/
+
+          echo "load_module \"modules/ngx_http_perl_module.so\";" >> ${{targets.subpkgdir}}/etc/nginx/modules/10_http_perl.conf
+    test:
+      pipeline:
+        - uses: test/tw/ldd-check
+
   - name: ${{package.name}}-src
     description: Nginx source code
     dependencies: