diff --git a/dependency-management.html b/dependency-management.html
index 6faf55a..0420a0c 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -659,7 +659,7 @@
 <tr class="a">
 <td align="left">net.java.dev.jna</td>
 <td><a class="externalLink" href="https://github.com/java-native-access/jna">jna</a></td>
-<td>5.10.0</td>
+<td>5.12.1</td>
 <td>-</td>
 <td>jar</td>
 <td><a class="externalLink" href="https://www.gnu.org/licenses/old-licenses/lgpl-2.1">LGPL-2.1-or-later</a>, <a class="externalLink" href="https://www.apache.org/licenses/LICENSE-2.0.txt">Apache-2.0</a></td></tr>
diff --git a/developers/building.html b/developers/building.html
index 8dc0858..bdd489e 100644
--- a/developers/building.html
+++ b/developers/building.html
@@ -314,16 +314,19 @@
 <div class="ulist">
 <ul>
 <li>
-<p><code>with-sandbox</code>: Builds the modules which are not yet considered stable enough to become part of the main distribution</p>
-</li>
-<li>
-<p><code>with-cpp</code>: Builds all C++ related modules, integrations and examples</p>
+<p><code>with-c</code>: Builds all C related modules, integrations and examples</p>
 </li>
 <li>
 <p><code>with-dotnet</code>: Builds all C# and .Net related modules, integrations and examples</p>
 </li>
 <li>
-<p><code>with-python</code>: Builds all Python related modules, integrations and examples</p>
+<p><code>with-go</code>: Builds all Go related modules, integrations and examples</p>
+</li>
+<li>
+<p><code>with-python</code>: Builds all Python related modules, integrations and examples (Also requires <code>with-sandbox</code>)</p>
+</li>
+<li>
+<p><code>with-sandbox</code>: Builds the modules which are not yet considered stable enough to become part of the main distribution</p>
 </li>
 </ul>
 </div>
@@ -389,7 +392,7 @@
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>mvn -P with-boost,with-cpp,with-docker,with-dotnet,with-sandbox,with-logstash,with-proxies,with-python,with-sandbox install</pre>
+<pre>mvn -P with-c,with-dotnet,with-go,with-python,with-sandbox install</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -400,11 +403,11 @@
 </div>
 <div class="literalblock">
 <div class="content">
-<pre>mvn -P with-boost,with-cpp,with-docker,with-dotnet,with-sandbox,with-logstash,with-proxies,with-python,with-sandbox install -DskipTests</pre>
+<pre>mvn -P with-c,with-dotnet,with-go,with-python,with-sandbox install -DskipTests</pre>
 </div>
 </div>
 <div class="paragraph">
-<p>This will not skip the compilation of tests however.</p>
+<p>This will not skip the compilation of tests, however.</p>
 </div>
 </div>
 <div class="sect2">
diff --git a/developers/preparing/index.html b/developers/preparing/index.html
index 426dd9a..16353f6 100644
--- a/developers/preparing/index.html
+++ b/developers/preparing/index.html
@@ -243,9 +243,6 @@
 <p>In order to build most Java parts of <code>PLC4X</code> you are required to have at least <code>Java 9</code> installed on your machine.
 Some integration modules and some other languages however may add some additional constraints to this.</p>
 </div>
-<div class="paragraph">
-<p>As soon as you&#8217;re building with the <code>with-c</code>, <code>with-cpp</code> or <code>with-proxies</code> you need to use at least <code>Java 11</code> as the <code>cmake-maven-plugin</code> requires at least this version.</p>
-</div>
 <div class="admonitionblock tip">
 <table>
 <tr>
@@ -253,19 +250,7 @@
 <div class="title">Tip</div>
 </td>
 <td class="content">
-Currently, Java 11 is the sweet-spot for being able to build all parts of PLC4X.
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Tip</div>
-</td>
-<td class="content">
-We have tested the build with Java 11 up to Java 16 (Latest version at the time of writing this document).
+We have tested the build with Java 11 up to Java 18 (Latest version at the time of writing this document).
 </td>
 </tr>
 </table>
@@ -276,7 +261,7 @@
 However, in the past with Oracle&#8217;s new release strategy, there have been a few bumps on the road.</p>
 </div>
 <div class="paragraph">
-<p>Also will PLC4X build with any Maven version starting with <code>Maven 3.3.0</code> however the <code>with-c</code>, <code>with-cpp</code> and <code>with-proxies</code> profiles require at least <code>Maven 3.6</code> as the <code>cmake-maven-plugin</code> requires this.</p>
+<p>Also will PLC4X build with any Maven version starting with <code>Maven 3.3.0</code> however the <code>with-c</code> profile requires at least <code>Maven 3.6</code> as the <code>cmake-maven-plugin</code> requires this.</p>
 </div>
 <div class="admonitionblock tip">
 <table>
@@ -285,7 +270,7 @@
 <div class="title">Tip</div>
 </td>
 <td class="content">
-Currently Maven 3.6 and above is required for being able to build all parts of PLC4X.
+Currently, Maven 3.6 and above is required for being able to build all parts of PLC4X.
 </td>
 </tr>
 </table>
@@ -317,18 +302,9 @@
 </div></div></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>with-cpp</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Builds C++ API, drivers, integrations, examples</p></td>
-<td class="tableblock halign-left valign-top"><div class="content"><div class="ulist">
-<ul>
-<li>
-<p>gcc</p>
-</li>
-<li>
-<p>g++</p>
-</li>
-</ul>
-</div></div></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>with-c</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">Builds C API, drivers, integrations, examples</p></td>
+<td class="tableblock halign-left valign-top"><div class="content"></div></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>with-dotnet</code></p></td>
@@ -347,35 +323,10 @@
 <td class="tableblock halign-left valign-top"><div class="content"><div class="ulist">
 <ul>
 <li>
-<p>python (2.7)</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>with-proxies</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Adds proxy modules to each enabled language</p></td>
-<td class="tableblock halign-left valign-top"><div class="content"><div class="ulist">
-<ul>
-<li>
-<p>bison</p>
+<p>python (min 3.7)</p>
 </li>
 <li>
-<p>flex</p>
-</li>
-<li>
-<p>python</p>
-</li>
-</ul>
-</div></div></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>with-docker</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Adds building of Docker images</p></td>
-<td class="tableblock halign-left valign-top"><div class="content"><div class="ulist">
-<ul>
-<li>
-<p>docker</p>
+<p>pyenv</p>
 </li>
 </ul>
 </div></div></td>
diff --git a/plugin-management.html b/plugin-management.html
index a3ba5cd..3f00c59 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -257,7 +257,7 @@
 <tr class="b">
 <td align="left">org.apache.maven.plugins</td>
 <td><a class="externalLink" href="https://maven.apache.org/surefire/maven-surefire-plugin/">maven-surefire-plugin</a></td>
-<td>3.0.0-M5</td></tr>
+<td>3.0.0-M7</td></tr>
 <tr class="a">
 <td align="left">org.apache.maven.plugins</td>
 <td><a class="externalLink" href="https://maven.apache.org/surefire/maven-surefire-report-plugin/">maven-surefire-report-plugin</a></td>