diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb1310..23ae0b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # OutSystems.SetupTools Release History
 
+## 3.18.0.0
+
+- Make MS Build Tools installation optional for Platform Server versions 11 or greater. Platform Server version 10 still installs MS Build Tools.
+- Fix for "Set-OSServerConfig fails if value of setting includes an ampersand (&) character" #127
+
 ## 3.17.1.0
 - Exclude Server.API and Server.Identity from being moved to another app pool (#122)
 
diff --git a/appveyor.yml b/appveyor.yml
index bdf7d84..b1ebb90 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.17.1.{build}
+version: 3.18.0.{build}
 
 only_commits:
   files:
diff --git a/src/Outsystems.SetupTools/OutSystems.SetupTools.psd1 b/src/Outsystems.SetupTools/OutSystems.SetupTools.psd1
index bce83d2..a9519c8 100644
--- a/src/Outsystems.SetupTools/OutSystems.SetupTools.psd1
+++ b/src/Outsystems.SetupTools/OutSystems.SetupTools.psd1
@@ -12,7 +12,7 @@
 RootModule = 'OutSystems.SetupTools.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.17.1.0'
+ModuleVersion = '3.18.0.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()