diff --git a/doc/available-tools.md b/doc/available-tools.md
index 362d026..3a4771f 100644
--- a/doc/available-tools.md
+++ b/doc/available-tools.md
@@ -17,6 +17,8 @@ Tools |
 
 ### Available Tools
 
+> **Disclaimer:** It is currently not clear what tools are available in which PHP image (version-dependent). This documentation was done by hand and work has currently started to automate this and keep exact tools up-to-date for each of the provided PHP version.
+
 <table>
  <thead>
   <tr>
diff --git a/doc/php-modules.md b/doc/php-modules.md
index 45fb065..6471145 100644
--- a/doc/php-modules.md
+++ b/doc/php-modules.md
@@ -14,12 +14,16 @@ Extensions |
 <h2><img name="Documentation" title="Documentation" width="20" src="https://github.com/devilbox/artwork/raw/master/submissions_logo/cytopia/01/png/logo_64_trans.png"> Documentation</h2>
 
 
+:information_source: For details on how to generate modules see **[Abuser Documentation: Build your own image](../doc/abuser/README.md)**<br/>
 :information_source: For details on how to add/edit modules see **[Contributor Documentation: PHP Modules](../php_modules/README.md)**
 
+
 #### PHP Modules (`base`)
 
 The following PHP modules are available on the `base` flavour:
 
+> :information_source: Click on any extension name to find out what they are
+
 <table>
  <tr>
    <th><sup>Ext</sup></th>
@@ -637,6 +641,8 @@ The following PHP modules are available on the `base` flavour:
 
 The following PHP modules are available on the `mods`, `prod` and `work` flavour:
 
+> :information_source: Click on any extension name to find out what they are
+
 <table>
  <tr>
    <th><sup>Ext</sup></th>
diff --git a/php_modules/README.md b/php_modules/README.md
index 163ef90..b2ad686 100644
--- a/php_modules/README.md
+++ b/php_modules/README.md
@@ -37,10 +37,12 @@ All PHP modules/extensions (for all PHP versions and both for `amd64` and `arm64
 
 # Only generate group_vars for curl
 # Note: if curl has other modules as requirements to be built beforehand, those will also be added
-python3 ./bin/module-generate.py curl
+make gen-modules ARGS="curl"
 make gen-dockerfiles
 ```
 
+:information_source: For details on how to generate modules see **[Abuser Documentation: Build your own image](../doc/abuser/README.md)**
+
 
 ## Extension definition: `build.yml`