diff --git a/HISTORY.rst b/HISTORY.rst
index b36ed218..2aa67744 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -15,7 +15,7 @@ PlatformIO Core 6
 
 **A professional collaborative platform for declarative, safety-critical, and test-driven embedded development.**
 
-6.1.8 (2023-??-??)
+6.1.8 (2023-07-05)
 ~~~~~~~~~~~~~~~~~~
 
 * Added a new ``--lint`` option to the `pio project config <https://docs.platformio.org/en/latest/core/userguide/project/cmd_config.html>`__ command, enabling users to efficiently perform linting on the |PIOCONF|
diff --git a/docs b/docs
index daa389f6..3f462c9a 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit daa389f68b9e3505f8e6aceda5d9362ba0cb5e54
+Subproject commit 3f462c9ae63623710d48c85e16241bbb0a2b6553
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 76b5f062..75b51791 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, "8rc2")
+VERSION = (6, 1, 8)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"