diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b4af1df3..ebe5d3c47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,12 +134,12 @@ test:freebsd:amd64:
 build:documentation:
   <<: *debian_stretch
   stage: build
+  dependencies:
+    - configure:debian:stretch:amd64
   only:
     - tags
     - triggers
   script:
-    - autoreconf -fi
-    - ./configure --with-module-dnstap --with-module-rosedb
     - make -C doc html singlehtml pdf
   artifacts:
     paths:
diff --git a/m4/knot-module.m4 b/m4/knot-module.m4
index d8d5d4720..b478faac3 100644
--- a/m4/knot-module.m4
+++ b/m4/knot-module.m4
@@ -10,17 +10,17 @@ AC_DEFUN([KNOT_MODULE],
     [module=$2]
   )
 
+  doc_modules="${doc_modules}.. include:: ../src/knot/modules/$1/$1.rst\n"
+
   STATIC_MODULE_$1=no
   SHARED_MODULE_$1=no
   AS_CASE([$module],
    [yes],    [STATIC_MODULE_$1=yes
               static_modules="${static_modules}$1 "
               static_modules_declars="${static_modules_declars}extern const knotd_mod_api_t knotd_mod_api_$1;\n"
-              static_modules_init="${static_modules_init}\\\\\n\t{ &knotd_mod_api_$1 },"
-              doc_modules="${doc_modules}.. include:: ../src/knot/modules/$1/$1.rst\n"],
+              static_modules_init="${static_modules_init}\\\\\n\t{ &knotd_mod_api_$1 },"],
    [shared], [SHARED_MODULE_$1=yes
               shared_modules="${shared_modules}$1 "
-              doc_modules="${doc_modules}.. include:: ../src/knot/modules/$1/$1.rst\n"
               AS_IF([test "$3" = "non-shareable"],
                     [AC_MSG_ERROR([Module $1 cannot be shared])])],
    [no],     [],