diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b3a31b4..291edea78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [7.0.5] / 2023-09-05
+- Fixed filtering environment variables with newlines in Docker target execution
+- Fixed logging in Docker target execution
+- Fixed update of version summary in `ChangelogTasks`
+- Fixed missing `DockerTasks` command
+
 ## [7.0.4] / 2023-08-31
 - Fixed check on nullable parameter type
 - Fixed telemetry check on home repository
@@ -1094,397 +1100,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added CLT tasks for Git
 - Fixed background color in console output
 
-[vNext]: https://github.com/nuke-build/nuke/compare/7.0.0...HEAD
-[7.0.0]: https://github.com/nuke-build/nuke/compare/6.3.0...7.0.0
-[6.3.0]: https://github.com/nuke-build/nuke/compare/6.2.1...6.3.0
-[6.2.1]: https://github.com/nuke-build/nuke/compare/6.2.0...6.2.1
-[6.2.0]: https://github.com/nuke-build/nuke/compare/6.1.2...6.2.0
-[6.1.2]: https://github.com/nuke-build/nuke/compare/6.1.1...6.1.2
-[6.1.1]: https://github.com/nuke-build/nuke/compare/6.1.0...6.1.1
-[6.1.0]: https://github.com/nuke-build/nuke/compare/6.0.3...6.1.0
-[6.0.3]: https://github.com/nuke-build/nuke/compare/6.0.2...6.0.3
-[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
-[6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
-[6.0.0]: https://github.com/nuke-build/nuke/compare/5.3.0...6.0.0
-[5.3.0]: https://github.com/nuke-build/nuke/compare/5.2.1...5.3.0
-[5.2.1]: https://github.com/nuke-build/nuke/compare/5.2.0...5.2.1
-[5.2.0]: https://github.com/nuke-build/nuke/compare/5.1.4...5.2.0
-[5.1.4]: https://github.com/nuke-build/nuke/compare/5.1.3...5.1.4
-[5.1.3]: https://github.com/nuke-build/nuke/compare/5.1.2...5.1.3
-[5.1.2]: https://github.com/nuke-build/nuke/compare/5.1.1...5.1.2
-[5.1.1]: https://github.com/nuke-build/nuke/compare/5.1.0...5.1.1
-[5.1.0]: https://github.com/nuke-build/nuke/compare/5.0.2...5.1.0
-[5.0.2]: https://github.com/nuke-build/nuke/compare/5.0.1...5.0.2
-[5.0.1]: https://github.com/nuke-build/nuke/compare/5.0.0...5.0.1
-[5.0.0]: https://github.com/nuke-build/nuke/compare/0.25.0...5.0.0
-[0.25.0]: https://github.com/nuke-build/nuke/compare/0.24.11...0.25.0
-[0.24.11]: https://github.com/nuke-build/nuke/compare/0.24.10...0.24.11
-[0.24.10]: https://github.com/nuke-build/nuke/compare/0.24.9...0.24.10
-[0.24.9]: https://github.com/nuke-build/nuke/compare/0.24.8...0.24.9
-[0.24.8]: https://github.com/nuke-build/nuke/compare/0.24.7...0.24.8
-[0.24.7]: https://github.com/nuke-build/nuke/compare/0.24.6...0.24.7
-[0.24.6]: https://github.com/nuke-build/nuke/compare/0.24.5...0.24.6
-[0.24.5]: https://github.com/nuke-build/nuke/compare/0.24.4...0.24.5
-[0.24.4]: https://github.com/nuke-build/nuke/compare/0.24.2...0.24.4
-[0.24.2]: https://github.com/nuke-build/nuke/compare/0.24.1...0.24.2
-[0.24.1]: https://github.com/nuke-build/nuke/compare/0.24.0...0.24.1
-[0.24.0]: https://github.com/nuke-build/nuke/compare/0.23.7...0.24.0
-[0.23.7]: https://github.com/nuke-build/nuke/compare/0.23.6...0.23.7
-[0.23.6]: https://github.com/nuke-build/nuke/compare/0.23.5...0.23.6
-[0.23.5]: https://github.com/nuke-build/nuke/compare/0.23.4...0.23.5
-[0.23.4]: https://github.com/nuke-build/nuke/compare/0.23.3...0.23.4
-[0.23.3]: https://github.com/nuke-build/nuke/compare/0.23.2...0.23.3
-[0.23.2]: https://github.com/nuke-build/nuke/compare/0.23.1...0.23.2
-[0.23.1]: https://github.com/nuke-build/nuke/compare/0.23.0...0.23.1
-[0.23.0]: https://github.com/nuke-build/nuke/compare/0.22.2...0.23.0
-[0.22.2]: https://github.com/nuke-build/nuke/compare/0.22.1...0.22.2
-[0.22.1]: https://github.com/nuke-build/nuke/compare/0.22.0...0.22.1
-[0.22.0]: https://github.com/nuke-build/nuke/compare/0.21.2...0.22.0
-[0.21.2]: https://github.com/nuke-build/nuke/compare/0.21.1...0.21.2
-[0.21.1]: https://github.com/nuke-build/nuke/compare/0.21.0...0.21.1
-[0.21.0]: https://github.com/nuke-build/nuke/compare/0.20.1...0.21.0
-[0.20.1]: https://github.com/nuke-build/nuke/compare/0.20.0...0.20.1
-[0.20.0]: https://github.com/nuke-build/nuke/compare/0.19.2...0.20.0
-[0.19.2]: https://github.com/nuke-build/nuke/compare/0.19.1...0.19.2
-[0.19.1]: https://github.com/nuke-build/nuke/compare/0.19.0...0.19.1
-[0.19.0]: https://github.com/nuke-build/nuke/compare/0.18.0...0.19.0
-[0.18.0]: https://github.com/nuke-build/nuke/compare/0.17.7...0.18.0
-[0.17.7]: https://github.com/nuke-build/nuke/compare/0.17.6...0.17.7
-[0.17.6]: https://github.com/nuke-build/nuke/compare/0.17.5...0.17.6
-[0.17.5]: https://github.com/nuke-build/nuke/compare/0.17.4...0.17.5
-[0.17.4]: https://github.com/nuke-build/nuke/compare/0.17.3...0.17.4
-[0.17.3]: https://github.com/nuke-build/nuke/compare/0.17.2...0.17.3
-[0.17.2]: https://github.com/nuke-build/nuke/compare/0.17.1...0.17.2
-[0.17.1]: https://github.com/nuke-build/nuke/compare/0.17.0...0.17.1
-[0.17.0]: https://github.com/nuke-build/nuke/compare/0.16.0...0.17.0
-[0.16.0]: https://github.com/nuke-build/nuke/compare/0.15.0...0.16.0
-[0.15.0]: https://github.com/nuke-build/nuke/compare/0.14.1...0.15.0
-[0.14.1]: https://github.com/nuke-build/nuke/compare/0.14.0...0.14.1
-[0.14.0]: https://github.com/nuke-build/nuke/compare/0.13.0...0.14.0
-[0.13.0]: https://github.com/nuke-build/nuke/compare/0.12.4...0.13.0
-[0.12.4]: https://github.com/nuke-build/nuke/compare/0.12.3...0.12.4
-[0.12.3]: https://github.com/nuke-build/nuke/compare/0.12.2...0.12.3
-[0.12.2]: https://github.com/nuke-build/nuke/compare/0.12.1...0.12.2
-[0.12.1]: https://github.com/nuke-build/nuke/compare/0.12.0...0.12.1
-[0.12.0]: https://github.com/nuke-build/nuke/compare/0.11.1...0.12.0
-[0.11.1]: https://github.com/nuke-build/nuke/compare/0.11.0...0.11.1
-[0.11.0]: https://github.com/nuke-build/nuke/compare/0.10.5...0.11.0
-[0.10.5]: https://github.com/nuke-build/nuke/compare/0.10.4...0.10.5
-[0.10.4]: https://github.com/nuke-build/nuke/compare/0.10.3...0.10.4
-[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
-[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
-[0.10.1]: https://github.com/nuke-build/nuke/compare/0.10.0...0.10.1
-[0.10.0]: https://github.com/nuke-build/nuke/compare/0.9.1...0.10.0
-[0.9.1]: https://github.com/nuke-build/nuke/compare/0.9.0...0.9.1
-[0.9.0]: https://github.com/nuke-build/nuke/compare/0.8.0...0.9.0
-[0.8.0]: https://github.com/nuke-build/nuke/compare/0.7.0...0.8.0
-[0.7.0]: https://github.com/nuke-build/nuke/compare/0.6.2...0.7.0
-[0.6.2]: https://github.com/nuke-build/nuke/compare/0.6.1...0.6.2
-[0.6.1]: https://github.com/nuke-build/nuke/compare/0.6.0...0.6.1
-[0.6.0]: https://github.com/nuke-build/nuke/compare/0.5.3...0.6.0
-[0.5.3]: https://github.com/nuke-build/nuke/compare/0.5.2...0.5.3
-[0.5.2]: https://github.com/nuke-build/nuke/compare/0.5.0...0.5.2
-[0.5.0]: https://github.com/nuke-build/nuke/compare/0.4.0...0.5.0
-[0.4.0]: https://github.com/nuke-build/nuke/compare/0.3.1...0.4.0
-[0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
-[0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
-[0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0
-
-[vNext]: https://github.com/nuke-build/nuke/compare/7.0.1...HEAD
-[7.0.1]: https://github.com/nuke-build/nuke/compare/7.0.0...7.0.1
-[7.0.0]: https://github.com/nuke-build/nuke/compare/6.3.0...7.0.0
-[6.3.0]: https://github.com/nuke-build/nuke/compare/6.2.1...6.3.0
-[6.2.1]: https://github.com/nuke-build/nuke/compare/6.2.0...6.2.1
-[6.2.0]: https://github.com/nuke-build/nuke/compare/6.1.2...6.2.0
-[6.1.2]: https://github.com/nuke-build/nuke/compare/6.1.1...6.1.2
-[6.1.1]: https://github.com/nuke-build/nuke/compare/6.1.0...6.1.1
-[6.1.0]: https://github.com/nuke-build/nuke/compare/6.0.3...6.1.0
-[6.0.3]: https://github.com/nuke-build/nuke/compare/6.0.2...6.0.3
-[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
-[6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
-[6.0.0]: https://github.com/nuke-build/nuke/compare/5.3.0...6.0.0
-[5.3.0]: https://github.com/nuke-build/nuke/compare/5.2.1...5.3.0
-[5.2.1]: https://github.com/nuke-build/nuke/compare/5.2.0...5.2.1
-[5.2.0]: https://github.com/nuke-build/nuke/compare/5.1.4...5.2.0
-[5.1.4]: https://github.com/nuke-build/nuke/compare/5.1.3...5.1.4
-[5.1.3]: https://github.com/nuke-build/nuke/compare/5.1.2...5.1.3
-[5.1.2]: https://github.com/nuke-build/nuke/compare/5.1.1...5.1.2
-[5.1.1]: https://github.com/nuke-build/nuke/compare/5.1.0...5.1.1
-[5.1.0]: https://github.com/nuke-build/nuke/compare/5.0.2...5.1.0
-[5.0.2]: https://github.com/nuke-build/nuke/compare/5.0.1...5.0.2
-[5.0.1]: https://github.com/nuke-build/nuke/compare/5.0.0...5.0.1
-[5.0.0]: https://github.com/nuke-build/nuke/compare/0.25.0...5.0.0
-[0.25.0]: https://github.com/nuke-build/nuke/compare/0.24.11...0.25.0
-[0.24.11]: https://github.com/nuke-build/nuke/compare/0.24.10...0.24.11
-[0.24.10]: https://github.com/nuke-build/nuke/compare/0.24.9...0.24.10
-[0.24.9]: https://github.com/nuke-build/nuke/compare/0.24.8...0.24.9
-[0.24.8]: https://github.com/nuke-build/nuke/compare/0.24.7...0.24.8
-[0.24.7]: https://github.com/nuke-build/nuke/compare/0.24.6...0.24.7
-[0.24.6]: https://github.com/nuke-build/nuke/compare/0.24.5...0.24.6
-[0.24.5]: https://github.com/nuke-build/nuke/compare/0.24.4...0.24.5
-[0.24.4]: https://github.com/nuke-build/nuke/compare/0.24.2...0.24.4
-[0.24.2]: https://github.com/nuke-build/nuke/compare/0.24.1...0.24.2
-[0.24.1]: https://github.com/nuke-build/nuke/compare/0.24.0...0.24.1
-[0.24.0]: https://github.com/nuke-build/nuke/compare/0.23.7...0.24.0
-[0.23.7]: https://github.com/nuke-build/nuke/compare/0.23.6...0.23.7
-[0.23.6]: https://github.com/nuke-build/nuke/compare/0.23.5...0.23.6
-[0.23.5]: https://github.com/nuke-build/nuke/compare/0.23.4...0.23.5
-[0.23.4]: https://github.com/nuke-build/nuke/compare/0.23.3...0.23.4
-[0.23.3]: https://github.com/nuke-build/nuke/compare/0.23.2...0.23.3
-[0.23.2]: https://github.com/nuke-build/nuke/compare/0.23.1...0.23.2
-[0.23.1]: https://github.com/nuke-build/nuke/compare/0.23.0...0.23.1
-[0.23.0]: https://github.com/nuke-build/nuke/compare/0.22.2...0.23.0
-[0.22.2]: https://github.com/nuke-build/nuke/compare/0.22.1...0.22.2
-[0.22.1]: https://github.com/nuke-build/nuke/compare/0.22.0...0.22.1
-[0.22.0]: https://github.com/nuke-build/nuke/compare/0.21.2...0.22.0
-[0.21.2]: https://github.com/nuke-build/nuke/compare/0.21.1...0.21.2
-[0.21.1]: https://github.com/nuke-build/nuke/compare/0.21.0...0.21.1
-[0.21.0]: https://github.com/nuke-build/nuke/compare/0.20.1...0.21.0
-[0.20.1]: https://github.com/nuke-build/nuke/compare/0.20.0...0.20.1
-[0.20.0]: https://github.com/nuke-build/nuke/compare/0.19.2...0.20.0
-[0.19.2]: https://github.com/nuke-build/nuke/compare/0.19.1...0.19.2
-[0.19.1]: https://github.com/nuke-build/nuke/compare/0.19.0...0.19.1
-[0.19.0]: https://github.com/nuke-build/nuke/compare/0.18.0...0.19.0
-[0.18.0]: https://github.com/nuke-build/nuke/compare/0.17.7...0.18.0
-[0.17.7]: https://github.com/nuke-build/nuke/compare/0.17.6...0.17.7
-[0.17.6]: https://github.com/nuke-build/nuke/compare/0.17.5...0.17.6
-[0.17.5]: https://github.com/nuke-build/nuke/compare/0.17.4...0.17.5
-[0.17.4]: https://github.com/nuke-build/nuke/compare/0.17.3...0.17.4
-[0.17.3]: https://github.com/nuke-build/nuke/compare/0.17.2...0.17.3
-[0.17.2]: https://github.com/nuke-build/nuke/compare/0.17.1...0.17.2
-[0.17.1]: https://github.com/nuke-build/nuke/compare/0.17.0...0.17.1
-[0.17.0]: https://github.com/nuke-build/nuke/compare/0.16.0...0.17.0
-[0.16.0]: https://github.com/nuke-build/nuke/compare/0.15.0...0.16.0
-[0.15.0]: https://github.com/nuke-build/nuke/compare/0.14.1...0.15.0
-[0.14.1]: https://github.com/nuke-build/nuke/compare/0.14.0...0.14.1
-[0.14.0]: https://github.com/nuke-build/nuke/compare/0.13.0...0.14.0
-[0.13.0]: https://github.com/nuke-build/nuke/compare/0.12.4...0.13.0
-[0.12.4]: https://github.com/nuke-build/nuke/compare/0.12.3...0.12.4
-[0.12.3]: https://github.com/nuke-build/nuke/compare/0.12.2...0.12.3
-[0.12.2]: https://github.com/nuke-build/nuke/compare/0.12.1...0.12.2
-[0.12.1]: https://github.com/nuke-build/nuke/compare/0.12.0...0.12.1
-[0.12.0]: https://github.com/nuke-build/nuke/compare/0.11.1...0.12.0
-[0.11.1]: https://github.com/nuke-build/nuke/compare/0.11.0...0.11.1
-[0.11.0]: https://github.com/nuke-build/nuke/compare/0.10.5...0.11.0
-[0.10.5]: https://github.com/nuke-build/nuke/compare/0.10.4...0.10.5
-[0.10.4]: https://github.com/nuke-build/nuke/compare/0.10.3...0.10.4
-[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
-[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
-[0.10.1]: https://github.com/nuke-build/nuke/compare/0.10.0...0.10.1
-[0.10.0]: https://github.com/nuke-build/nuke/compare/0.9.1...0.10.0
-[0.9.1]: https://github.com/nuke-build/nuke/compare/0.9.0...0.9.1
-[0.9.0]: https://github.com/nuke-build/nuke/compare/0.8.0...0.9.0
-[0.8.0]: https://github.com/nuke-build/nuke/compare/0.7.0...0.8.0
-[0.7.0]: https://github.com/nuke-build/nuke/compare/0.6.2...0.7.0
-[0.6.2]: https://github.com/nuke-build/nuke/compare/0.6.1...0.6.2
-[0.6.1]: https://github.com/nuke-build/nuke/compare/0.6.0...0.6.1
-[0.6.0]: https://github.com/nuke-build/nuke/compare/0.5.3...0.6.0
-[0.5.3]: https://github.com/nuke-build/nuke/compare/0.5.2...0.5.3
-[0.5.2]: https://github.com/nuke-build/nuke/compare/0.5.0...0.5.2
-[0.5.0]: https://github.com/nuke-build/nuke/compare/0.4.0...0.5.0
-[0.4.0]: https://github.com/nuke-build/nuke/compare/0.3.1...0.4.0
-[0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
-[0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
-[0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0
-
-[vNext]: https://github.com/nuke-build/nuke/compare/7.0.2...HEAD
-[7.0.2]: https://github.com/nuke-build/nuke/compare/7.0.1...7.0.2
-[7.0.1]: https://github.com/nuke-build/nuke/compare/7.0.0...7.0.1
-[7.0.0]: https://github.com/nuke-build/nuke/compare/6.3.0...7.0.0
-[6.3.0]: https://github.com/nuke-build/nuke/compare/6.2.1...6.3.0
-[6.2.1]: https://github.com/nuke-build/nuke/compare/6.2.0...6.2.1
-[6.2.0]: https://github.com/nuke-build/nuke/compare/6.1.2...6.2.0
-[6.1.2]: https://github.com/nuke-build/nuke/compare/6.1.1...6.1.2
-[6.1.1]: https://github.com/nuke-build/nuke/compare/6.1.0...6.1.1
-[6.1.0]: https://github.com/nuke-build/nuke/compare/6.0.3...6.1.0
-[6.0.3]: https://github.com/nuke-build/nuke/compare/6.0.2...6.0.3
-[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
-[6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
-[6.0.0]: https://github.com/nuke-build/nuke/compare/5.3.0...6.0.0
-[5.3.0]: https://github.com/nuke-build/nuke/compare/5.2.1...5.3.0
-[5.2.1]: https://github.com/nuke-build/nuke/compare/5.2.0...5.2.1
-[5.2.0]: https://github.com/nuke-build/nuke/compare/5.1.4...5.2.0
-[5.1.4]: https://github.com/nuke-build/nuke/compare/5.1.3...5.1.4
-[5.1.3]: https://github.com/nuke-build/nuke/compare/5.1.2...5.1.3
-[5.1.2]: https://github.com/nuke-build/nuke/compare/5.1.1...5.1.2
-[5.1.1]: https://github.com/nuke-build/nuke/compare/5.1.0...5.1.1
-[5.1.0]: https://github.com/nuke-build/nuke/compare/5.0.2...5.1.0
-[5.0.2]: https://github.com/nuke-build/nuke/compare/5.0.1...5.0.2
-[5.0.1]: https://github.com/nuke-build/nuke/compare/5.0.0...5.0.1
-[5.0.0]: https://github.com/nuke-build/nuke/compare/0.25.0...5.0.0
-[0.25.0]: https://github.com/nuke-build/nuke/compare/0.24.11...0.25.0
-[0.24.11]: https://github.com/nuke-build/nuke/compare/0.24.10...0.24.11
-[0.24.10]: https://github.com/nuke-build/nuke/compare/0.24.9...0.24.10
-[0.24.9]: https://github.com/nuke-build/nuke/compare/0.24.8...0.24.9
-[0.24.8]: https://github.com/nuke-build/nuke/compare/0.24.7...0.24.8
-[0.24.7]: https://github.com/nuke-build/nuke/compare/0.24.6...0.24.7
-[0.24.6]: https://github.com/nuke-build/nuke/compare/0.24.5...0.24.6
-[0.24.5]: https://github.com/nuke-build/nuke/compare/0.24.4...0.24.5
-[0.24.4]: https://github.com/nuke-build/nuke/compare/0.24.2...0.24.4
-[0.24.2]: https://github.com/nuke-build/nuke/compare/0.24.1...0.24.2
-[0.24.1]: https://github.com/nuke-build/nuke/compare/0.24.0...0.24.1
-[0.24.0]: https://github.com/nuke-build/nuke/compare/0.23.7...0.24.0
-[0.23.7]: https://github.com/nuke-build/nuke/compare/0.23.6...0.23.7
-[0.23.6]: https://github.com/nuke-build/nuke/compare/0.23.5...0.23.6
-[0.23.5]: https://github.com/nuke-build/nuke/compare/0.23.4...0.23.5
-[0.23.4]: https://github.com/nuke-build/nuke/compare/0.23.3...0.23.4
-[0.23.3]: https://github.com/nuke-build/nuke/compare/0.23.2...0.23.3
-[0.23.2]: https://github.com/nuke-build/nuke/compare/0.23.1...0.23.2
-[0.23.1]: https://github.com/nuke-build/nuke/compare/0.23.0...0.23.1
-[0.23.0]: https://github.com/nuke-build/nuke/compare/0.22.2...0.23.0
-[0.22.2]: https://github.com/nuke-build/nuke/compare/0.22.1...0.22.2
-[0.22.1]: https://github.com/nuke-build/nuke/compare/0.22.0...0.22.1
-[0.22.0]: https://github.com/nuke-build/nuke/compare/0.21.2...0.22.0
-[0.21.2]: https://github.com/nuke-build/nuke/compare/0.21.1...0.21.2
-[0.21.1]: https://github.com/nuke-build/nuke/compare/0.21.0...0.21.1
-[0.21.0]: https://github.com/nuke-build/nuke/compare/0.20.1...0.21.0
-[0.20.1]: https://github.com/nuke-build/nuke/compare/0.20.0...0.20.1
-[0.20.0]: https://github.com/nuke-build/nuke/compare/0.19.2...0.20.0
-[0.19.2]: https://github.com/nuke-build/nuke/compare/0.19.1...0.19.2
-[0.19.1]: https://github.com/nuke-build/nuke/compare/0.19.0...0.19.1
-[0.19.0]: https://github.com/nuke-build/nuke/compare/0.18.0...0.19.0
-[0.18.0]: https://github.com/nuke-build/nuke/compare/0.17.7...0.18.0
-[0.17.7]: https://github.com/nuke-build/nuke/compare/0.17.6...0.17.7
-[0.17.6]: https://github.com/nuke-build/nuke/compare/0.17.5...0.17.6
-[0.17.5]: https://github.com/nuke-build/nuke/compare/0.17.4...0.17.5
-[0.17.4]: https://github.com/nuke-build/nuke/compare/0.17.3...0.17.4
-[0.17.3]: https://github.com/nuke-build/nuke/compare/0.17.2...0.17.3
-[0.17.2]: https://github.com/nuke-build/nuke/compare/0.17.1...0.17.2
-[0.17.1]: https://github.com/nuke-build/nuke/compare/0.17.0...0.17.1
-[0.17.0]: https://github.com/nuke-build/nuke/compare/0.16.0...0.17.0
-[0.16.0]: https://github.com/nuke-build/nuke/compare/0.15.0...0.16.0
-[0.15.0]: https://github.com/nuke-build/nuke/compare/0.14.1...0.15.0
-[0.14.1]: https://github.com/nuke-build/nuke/compare/0.14.0...0.14.1
-[0.14.0]: https://github.com/nuke-build/nuke/compare/0.13.0...0.14.0
-[0.13.0]: https://github.com/nuke-build/nuke/compare/0.12.4...0.13.0
-[0.12.4]: https://github.com/nuke-build/nuke/compare/0.12.3...0.12.4
-[0.12.3]: https://github.com/nuke-build/nuke/compare/0.12.2...0.12.3
-[0.12.2]: https://github.com/nuke-build/nuke/compare/0.12.1...0.12.2
-[0.12.1]: https://github.com/nuke-build/nuke/compare/0.12.0...0.12.1
-[0.12.0]: https://github.com/nuke-build/nuke/compare/0.11.1...0.12.0
-[0.11.1]: https://github.com/nuke-build/nuke/compare/0.11.0...0.11.1
-[0.11.0]: https://github.com/nuke-build/nuke/compare/0.10.5...0.11.0
-[0.10.5]: https://github.com/nuke-build/nuke/compare/0.10.4...0.10.5
-[0.10.4]: https://github.com/nuke-build/nuke/compare/0.10.3...0.10.4
-[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
-[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
-[0.10.1]: https://github.com/nuke-build/nuke/compare/0.10.0...0.10.1
-[0.10.0]: https://github.com/nuke-build/nuke/compare/0.9.1...0.10.0
-[0.9.1]: https://github.com/nuke-build/nuke/compare/0.9.0...0.9.1
-[0.9.0]: https://github.com/nuke-build/nuke/compare/0.8.0...0.9.0
-[0.8.0]: https://github.com/nuke-build/nuke/compare/0.7.0...0.8.0
-[0.7.0]: https://github.com/nuke-build/nuke/compare/0.6.2...0.7.0
-[0.6.2]: https://github.com/nuke-build/nuke/compare/0.6.1...0.6.2
-[0.6.1]: https://github.com/nuke-build/nuke/compare/0.6.0...0.6.1
-[0.6.0]: https://github.com/nuke-build/nuke/compare/0.5.3...0.6.0
-[0.5.3]: https://github.com/nuke-build/nuke/compare/0.5.2...0.5.3
-[0.5.2]: https://github.com/nuke-build/nuke/compare/0.5.0...0.5.2
-[0.5.0]: https://github.com/nuke-build/nuke/compare/0.4.0...0.5.0
-[0.4.0]: https://github.com/nuke-build/nuke/compare/0.3.1...0.4.0
-[0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
-[0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
-[0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0
-
-[vNext]: https://github.com/nuke-build/nuke/compare/7.0.3...HEAD
-[7.0.3]: https://github.com/nuke-build/nuke/compare/7.0.2...7.0.3
-[7.0.2]: https://github.com/nuke-build/nuke/compare/7.0.1...7.0.2
-[7.0.1]: https://github.com/nuke-build/nuke/compare/7.0.0...7.0.1
-[7.0.0]: https://github.com/nuke-build/nuke/compare/6.3.0...7.0.0
-[6.3.0]: https://github.com/nuke-build/nuke/compare/6.2.1...6.3.0
-[6.2.1]: https://github.com/nuke-build/nuke/compare/6.2.0...6.2.1
-[6.2.0]: https://github.com/nuke-build/nuke/compare/6.1.2...6.2.0
-[6.1.2]: https://github.com/nuke-build/nuke/compare/6.1.1...6.1.2
-[6.1.1]: https://github.com/nuke-build/nuke/compare/6.1.0...6.1.1
-[6.1.0]: https://github.com/nuke-build/nuke/compare/6.0.3...6.1.0
-[6.0.3]: https://github.com/nuke-build/nuke/compare/6.0.2...6.0.3
-[6.0.2]: https://github.com/nuke-build/nuke/compare/6.0.1...6.0.2
-[6.0.1]: https://github.com/nuke-build/nuke/compare/6.0.0...6.0.1
-[6.0.0]: https://github.com/nuke-build/nuke/compare/5.3.0...6.0.0
-[5.3.0]: https://github.com/nuke-build/nuke/compare/5.2.1...5.3.0
-[5.2.1]: https://github.com/nuke-build/nuke/compare/5.2.0...5.2.1
-[5.2.0]: https://github.com/nuke-build/nuke/compare/5.1.4...5.2.0
-[5.1.4]: https://github.com/nuke-build/nuke/compare/5.1.3...5.1.4
-[5.1.3]: https://github.com/nuke-build/nuke/compare/5.1.2...5.1.3
-[5.1.2]: https://github.com/nuke-build/nuke/compare/5.1.1...5.1.2
-[5.1.1]: https://github.com/nuke-build/nuke/compare/5.1.0...5.1.1
-[5.1.0]: https://github.com/nuke-build/nuke/compare/5.0.2...5.1.0
-[5.0.2]: https://github.com/nuke-build/nuke/compare/5.0.1...5.0.2
-[5.0.1]: https://github.com/nuke-build/nuke/compare/5.0.0...5.0.1
-[5.0.0]: https://github.com/nuke-build/nuke/compare/0.25.0...5.0.0
-[0.25.0]: https://github.com/nuke-build/nuke/compare/0.24.11...0.25.0
-[0.24.11]: https://github.com/nuke-build/nuke/compare/0.24.10...0.24.11
-[0.24.10]: https://github.com/nuke-build/nuke/compare/0.24.9...0.24.10
-[0.24.9]: https://github.com/nuke-build/nuke/compare/0.24.8...0.24.9
-[0.24.8]: https://github.com/nuke-build/nuke/compare/0.24.7...0.24.8
-[0.24.7]: https://github.com/nuke-build/nuke/compare/0.24.6...0.24.7
-[0.24.6]: https://github.com/nuke-build/nuke/compare/0.24.5...0.24.6
-[0.24.5]: https://github.com/nuke-build/nuke/compare/0.24.4...0.24.5
-[0.24.4]: https://github.com/nuke-build/nuke/compare/0.24.2...0.24.4
-[0.24.2]: https://github.com/nuke-build/nuke/compare/0.24.1...0.24.2
-[0.24.1]: https://github.com/nuke-build/nuke/compare/0.24.0...0.24.1
-[0.24.0]: https://github.com/nuke-build/nuke/compare/0.23.7...0.24.0
-[0.23.7]: https://github.com/nuke-build/nuke/compare/0.23.6...0.23.7
-[0.23.6]: https://github.com/nuke-build/nuke/compare/0.23.5...0.23.6
-[0.23.5]: https://github.com/nuke-build/nuke/compare/0.23.4...0.23.5
-[0.23.4]: https://github.com/nuke-build/nuke/compare/0.23.3...0.23.4
-[0.23.3]: https://github.com/nuke-build/nuke/compare/0.23.2...0.23.3
-[0.23.2]: https://github.com/nuke-build/nuke/compare/0.23.1...0.23.2
-[0.23.1]: https://github.com/nuke-build/nuke/compare/0.23.0...0.23.1
-[0.23.0]: https://github.com/nuke-build/nuke/compare/0.22.2...0.23.0
-[0.22.2]: https://github.com/nuke-build/nuke/compare/0.22.1...0.22.2
-[0.22.1]: https://github.com/nuke-build/nuke/compare/0.22.0...0.22.1
-[0.22.0]: https://github.com/nuke-build/nuke/compare/0.21.2...0.22.0
-[0.21.2]: https://github.com/nuke-build/nuke/compare/0.21.1...0.21.2
-[0.21.1]: https://github.com/nuke-build/nuke/compare/0.21.0...0.21.1
-[0.21.0]: https://github.com/nuke-build/nuke/compare/0.20.1...0.21.0
-[0.20.1]: https://github.com/nuke-build/nuke/compare/0.20.0...0.20.1
-[0.20.0]: https://github.com/nuke-build/nuke/compare/0.19.2...0.20.0
-[0.19.2]: https://github.com/nuke-build/nuke/compare/0.19.1...0.19.2
-[0.19.1]: https://github.com/nuke-build/nuke/compare/0.19.0...0.19.1
-[0.19.0]: https://github.com/nuke-build/nuke/compare/0.18.0...0.19.0
-[0.18.0]: https://github.com/nuke-build/nuke/compare/0.17.7...0.18.0
-[0.17.7]: https://github.com/nuke-build/nuke/compare/0.17.6...0.17.7
-[0.17.6]: https://github.com/nuke-build/nuke/compare/0.17.5...0.17.6
-[0.17.5]: https://github.com/nuke-build/nuke/compare/0.17.4...0.17.5
-[0.17.4]: https://github.com/nuke-build/nuke/compare/0.17.3...0.17.4
-[0.17.3]: https://github.com/nuke-build/nuke/compare/0.17.2...0.17.3
-[0.17.2]: https://github.com/nuke-build/nuke/compare/0.17.1...0.17.2
-[0.17.1]: https://github.com/nuke-build/nuke/compare/0.17.0...0.17.1
-[0.17.0]: https://github.com/nuke-build/nuke/compare/0.16.0...0.17.0
-[0.16.0]: https://github.com/nuke-build/nuke/compare/0.15.0...0.16.0
-[0.15.0]: https://github.com/nuke-build/nuke/compare/0.14.1...0.15.0
-[0.14.1]: https://github.com/nuke-build/nuke/compare/0.14.0...0.14.1
-[0.14.0]: https://github.com/nuke-build/nuke/compare/0.13.0...0.14.0
-[0.13.0]: https://github.com/nuke-build/nuke/compare/0.12.4...0.13.0
-[0.12.4]: https://github.com/nuke-build/nuke/compare/0.12.3...0.12.4
-[0.12.3]: https://github.com/nuke-build/nuke/compare/0.12.2...0.12.3
-[0.12.2]: https://github.com/nuke-build/nuke/compare/0.12.1...0.12.2
-[0.12.1]: https://github.com/nuke-build/nuke/compare/0.12.0...0.12.1
-[0.12.0]: https://github.com/nuke-build/nuke/compare/0.11.1...0.12.0
-[0.11.1]: https://github.com/nuke-build/nuke/compare/0.11.0...0.11.1
-[0.11.0]: https://github.com/nuke-build/nuke/compare/0.10.5...0.11.0
-[0.10.5]: https://github.com/nuke-build/nuke/compare/0.10.4...0.10.5
-[0.10.4]: https://github.com/nuke-build/nuke/compare/0.10.3...0.10.4
-[0.10.3]: https://github.com/nuke-build/nuke/compare/0.10.2...0.10.3
-[0.10.2]: https://github.com/nuke-build/nuke/compare/0.10.1...0.10.2
-[0.10.1]: https://github.com/nuke-build/nuke/compare/0.10.0...0.10.1
-[0.10.0]: https://github.com/nuke-build/nuke/compare/0.9.1...0.10.0
-[0.9.1]: https://github.com/nuke-build/nuke/compare/0.9.0...0.9.1
-[0.9.0]: https://github.com/nuke-build/nuke/compare/0.8.0...0.9.0
-[0.8.0]: https://github.com/nuke-build/nuke/compare/0.7.0...0.8.0
-[0.7.0]: https://github.com/nuke-build/nuke/compare/0.6.2...0.7.0
-[0.6.2]: https://github.com/nuke-build/nuke/compare/0.6.1...0.6.2
-[0.6.1]: https://github.com/nuke-build/nuke/compare/0.6.0...0.6.1
-[0.6.0]: https://github.com/nuke-build/nuke/compare/0.5.3...0.6.0
-[0.5.3]: https://github.com/nuke-build/nuke/compare/0.5.2...0.5.3
-[0.5.2]: https://github.com/nuke-build/nuke/compare/0.5.0...0.5.2
-[0.5.0]: https://github.com/nuke-build/nuke/compare/0.4.0...0.5.0
-[0.4.0]: https://github.com/nuke-build/nuke/compare/0.3.1...0.4.0
-[0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
-[0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
-[0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0
-
-[vNext]: https://github.com/nuke-build/nuke/compare/7.0.4...HEAD
+[vNext]: https://github.com/nuke-build/nuke/compare/7.0.5...HEAD
+[7.0.5]: https://github.com/nuke-build/nuke/compare/7.0.4...7.0.5
 [7.0.4]: https://github.com/nuke-build/nuke/compare/7.0.3...7.0.4
 [7.0.3]: https://github.com/nuke-build/nuke/compare/7.0.2...7.0.3
 [7.0.2]: https://github.com/nuke-build/nuke/compare/7.0.1...7.0.2
diff --git a/source/Nuke.Common.Tests/ChangelogTasksTest.cs b/source/Nuke.Common.Tests/ChangelogTasksTest.cs
index 3f7f265d9..3f0c9d641 100644
--- a/source/Nuke.Common.Tests/ChangelogTasksTest.cs
+++ b/source/Nuke.Common.Tests/ChangelogTasksTest.cs
@@ -22,36 +22,6 @@ public class ChangelogTasksTest
 
         private static AbsolutePath PathToChangelogReferenceFiles => RootDirectory / "source" / "Nuke.Common.Tests" / "ChangelogReferenceFiles";
 
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public void ReadReleaseNotes_ChangelogReferenceFile_ThrowsNoExceptions(AbsolutePath file)
-        {
-            Action act = () => ChangelogTasks.ReadReleaseNotes(file);
-
-            act.Should().NotThrow();
-        }
-
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public void ReadReleaseNotes_ChangelogReferenceFile_ReturnsAnyReleaseNotes(AbsolutePath file)
-        {
-            var releaseNotes = ChangelogTasks.ReadReleaseNotes(file);
-
-            releaseNotes.Should().NotBeEmpty();
-        }
-
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public void ReadChangelog_ChangelogReferenceFile_ThrowsNoExceptions(AbsolutePath file)
-        {
-            Action act = () => ChangelogTasks.ReadChangelog(file);
-
-            act.Should().NotThrow();
-        }
-
         [Theory]
         [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
         [MemberData(nameof(AllChangelogReference_NUKE_Files))]
@@ -62,16 +32,6 @@ public void ExtractChangelogSectionNotes_ChangelogReferenceFile_ThrowsNoExceptio
             act.Should().NotThrow();
         }
 
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public Task ReadReleaseNotes_ChangelogReferenceFile_HasParsedCorrectly(AbsolutePath file)
-        {
-            var releaseNotes = ChangelogTasks.ReadReleaseNotes(file);
-
-            return Verifier.Verify(releaseNotes).UseDirectory(PathToChangelogReferenceFiles).UseFileName(file.NameWithoutExtension);
-        }
-
         [Fact]
         public void GetReleaseSections_ChangelogReferenceFileWithoutReleaseHead_ReturnsEmpty()
         {
diff --git a/source/Nuke.Common/ChangeLog/ChangeLogTasks.cs b/source/Nuke.Common/ChangeLog/ChangeLogTasks.cs
index e992341cf..e6ecf7017 100644
--- a/source/Nuke.Common/ChangeLog/ChangeLogTasks.cs
+++ b/source/Nuke.Common/ChangeLog/ChangeLogTasks.cs
@@ -178,6 +178,12 @@ internal static IEnumerable<ReleaseSection> GetReleaseSections(List<string> cont
         static bool IsReleaseHead(string str)
             => str.StartsWith("## ");
 
+        static bool IsReleaseContent(string str)
+            => str.StartsWith("###")
+               || str.Trim().StartsWith("-")
+               || str.Trim().StartsWith("*")
+               || str.Trim().StartsWith("+");
+
         static string GetCaption(string str)
             => str
                 .TrimStart('#', ' ', '[')
@@ -199,7 +205,7 @@ static string GetCaption(string str)
             }
 
             var caption = GetCaption(line);
-            var nextReleaseHeadIndex = content.FindIndex(index + 1, IsReleaseHead);
+            var nextReleaseHeadIndex = content.FindIndex(index + 1,  x => IsReleaseHead(x) || !IsReleaseContent(x));
 
             var releaseData =
                 new ReleaseSection
diff --git a/source/Nuke.Common/Tools/Docker/Docker.Generated.cs b/source/Nuke.Common/Tools/Docker/Docker.Generated.cs
index 023c4726f..cad1b7faf 100644
--- a/source/Nuke.Common/Tools/Docker/Docker.Generated.cs
+++ b/source/Nuke.Common/Tools/Docker/Docker.Generated.cs
@@ -10116,6 +10116,87 @@ public static IReadOnlyCollection<Output> DockerBuildxBuild(Configure<DockerBuil
         return configurator.Invoke(DockerBuildxBuild, DockerLogger, degreeOfParallelism, completeOnFailure);
     }
     /// <summary>
+    ///   <p>Create a new builder instance using Docker Buildx plugin.</p>
+    ///   <p>For more details, visit the <a href="https://www.docker.com/">official website</a>.</p>
+    /// </summary>
+    /// <remarks>
+    ///   <p>This is a <a href="http://www.nuke.build/docs/authoring-builds/cli-tools.html#fluent-apis">CLI wrapper with fluent API</a> that allows to modify the following arguments:</p>
+    ///   <ul>
+    ///     <li><c>&lt;cliSettings&gt;</c> via <see cref="DockerBuildxCreateSettings.CliSettings"/></li>
+    ///     <li><c>--append</c> via <see cref="DockerBuildxCreateSettings.Append"/></li>
+    ///     <li><c>--bootstrap</c> via <see cref="DockerBuildxCreateSettings.Bootstrap"/></li>
+    ///     <li><c>--buildkitd-flags</c> via <see cref="DockerBuildxCreateSettings.BuildKitDaemonFlags"/></li>
+    ///     <li><c>--buildkitd-flags</c> via <see cref="DockerBuildxCreateSettings.BuildKitDFlags"/></li>
+    ///     <li><c>--config</c> via <see cref="DockerBuildxCreateSettings.Config"/></li>
+    ///     <li><c>--driver</c> via <see cref="DockerBuildxCreateSettings.Driver"/></li>
+    ///     <li><c>--driver-opt</c> via <see cref="DockerBuildxCreateSettings.DriverOpt"/></li>
+    ///     <li><c>--leave</c> via <see cref="DockerBuildxCreateSettings.Leave"/></li>
+    ///     <li><c>--name</c> via <see cref="DockerBuildxCreateSettings.Name"/></li>
+    ///     <li><c>--node</c> via <see cref="DockerBuildxCreateSettings.Node"/></li>
+    ///     <li><c>--platform</c> via <see cref="DockerBuildxCreateSettings.Platform"/></li>
+    ///     <li><c>--use</c> via <see cref="DockerBuildxCreateSettings.Use"/></li>
+    ///   </ul>
+    /// </remarks>
+    public static IReadOnlyCollection<Output> DockerBuildxCreate(DockerBuildxCreateSettings toolSettings = null)
+    {
+        toolSettings = toolSettings ?? new DockerBuildxCreateSettings();
+        using var process = ProcessTasks.StartProcess(toolSettings);
+        toolSettings.ProcessExitHandler.Invoke(toolSettings, process.AssertWaitForExit());
+        return process.Output;
+    }
+    /// <summary>
+    ///   <p>Create a new builder instance using Docker Buildx plugin.</p>
+    ///   <p>For more details, visit the <a href="https://www.docker.com/">official website</a>.</p>
+    /// </summary>
+    /// <remarks>
+    ///   <p>This is a <a href="http://www.nuke.build/docs/authoring-builds/cli-tools.html#fluent-apis">CLI wrapper with fluent API</a> that allows to modify the following arguments:</p>
+    ///   <ul>
+    ///     <li><c>&lt;cliSettings&gt;</c> via <see cref="DockerBuildxCreateSettings.CliSettings"/></li>
+    ///     <li><c>--append</c> via <see cref="DockerBuildxCreateSettings.Append"/></li>
+    ///     <li><c>--bootstrap</c> via <see cref="DockerBuildxCreateSettings.Bootstrap"/></li>
+    ///     <li><c>--buildkitd-flags</c> via <see cref="DockerBuildxCreateSettings.BuildKitDaemonFlags"/></li>
+    ///     <li><c>--buildkitd-flags</c> via <see cref="DockerBuildxCreateSettings.BuildKitDFlags"/></li>
+    ///     <li><c>--config</c> via <see cref="DockerBuildxCreateSettings.Config"/></li>
+    ///     <li><c>--driver</c> via <see cref="DockerBuildxCreateSettings.Driver"/></li>
+    ///     <li><c>--driver-opt</c> via <see cref="DockerBuildxCreateSettings.DriverOpt"/></li>
+    ///     <li><c>--leave</c> via <see cref="DockerBuildxCreateSettings.Leave"/></li>
+    ///     <li><c>--name</c> via <see cref="DockerBuildxCreateSettings.Name"/></li>
+    ///     <li><c>--node</c> via <see cref="DockerBuildxCreateSettings.Node"/></li>
+    ///     <li><c>--platform</c> via <see cref="DockerBuildxCreateSettings.Platform"/></li>
+    ///     <li><c>--use</c> via <see cref="DockerBuildxCreateSettings.Use"/></li>
+    ///   </ul>
+    /// </remarks>
+    public static IReadOnlyCollection<Output> DockerBuildxCreate(Configure<DockerBuildxCreateSettings> configurator)
+    {
+        return DockerBuildxCreate(configurator(new DockerBuildxCreateSettings()));
+    }
+    /// <summary>
+    ///   <p>Create a new builder instance using Docker Buildx plugin.</p>
+    ///   <p>For more details, visit the <a href="https://www.docker.com/">official website</a>.</p>
+    /// </summary>
+    /// <remarks>
+    ///   <p>This is a <a href="http://www.nuke.build/docs/authoring-builds/cli-tools.html#fluent-apis">CLI wrapper with fluent API</a> that allows to modify the following arguments:</p>
+    ///   <ul>
+    ///     <li><c>&lt;cliSettings&gt;</c> via <see cref="DockerBuildxCreateSettings.CliSettings"/></li>
+    ///     <li><c>--append</c> via <see cref="DockerBuildxCreateSettings.Append"/></li>
+    ///     <li><c>--bootstrap</c> via <see cref="DockerBuildxCreateSettings.Bootstrap"/></li>
+    ///     <li><c>--buildkitd-flags</c> via <see cref="DockerBuildxCreateSettings.BuildKitDaemonFlags"/></li>
+    ///     <li><c>--buildkitd-flags</c> via <see cref="DockerBuildxCreateSettings.BuildKitDFlags"/></li>
+    ///     <li><c>--config</c> via <see cref="DockerBuildxCreateSettings.Config"/></li>
+    ///     <li><c>--driver</c> via <see cref="DockerBuildxCreateSettings.Driver"/></li>
+    ///     <li><c>--driver-opt</c> via <see cref="DockerBuildxCreateSettings.DriverOpt"/></li>
+    ///     <li><c>--leave</c> via <see cref="DockerBuildxCreateSettings.Leave"/></li>
+    ///     <li><c>--name</c> via <see cref="DockerBuildxCreateSettings.Name"/></li>
+    ///     <li><c>--node</c> via <see cref="DockerBuildxCreateSettings.Node"/></li>
+    ///     <li><c>--platform</c> via <see cref="DockerBuildxCreateSettings.Platform"/></li>
+    ///     <li><c>--use</c> via <see cref="DockerBuildxCreateSettings.Use"/></li>
+    ///   </ul>
+    /// </remarks>
+    public static IEnumerable<(DockerBuildxCreateSettings Settings, IReadOnlyCollection<Output> Output)> DockerBuildxCreate(CombinatorialConfigure<DockerBuildxCreateSettings> configurator, int degreeOfParallelism = 1, bool completeOnFailure = false)
+    {
+        return configurator.Invoke(DockerBuildxCreate, DockerLogger, degreeOfParallelism, completeOnFailure);
+    }
+    /// <summary>
     ///   <p>Display a live stream of container(s) resource usage statistics.</p>
     ///   <p>For more details, visit the <a href="https://www.docker.com/">official website</a>.</p>
     /// </summary>
@@ -21849,6 +21930,90 @@ protected override Arguments ConfigureProcessArguments(Arguments arguments)
     }
 }
 #endregion
+#region DockerBuildxCreateSettings
+/// <summary>
+///   Used within <see cref="DockerTasks"/>.
+/// </summary>
+[PublicAPI]
+[ExcludeFromCodeCoverage]
+[Serializable]
+public partial class DockerBuildxCreateSettings : DockerSettings
+{
+    /// <summary>
+    ///   Path to the Docker executable.
+    /// </summary>
+    public override string ProcessToolPath => base.ProcessToolPath ?? DockerTasks.DockerPath;
+    public override Action<OutputType, string> ProcessLogger => base.ProcessLogger ?? DockerTasks.DockerLogger;
+    public override Action<ToolSettings, IProcess> ProcessExitHandler => base.ProcessExitHandler ?? DockerTasks.DockerExitHandler;
+    /// <summary>
+    ///   Append a node to builder instead of changing it.
+    /// </summary>
+    public virtual bool? Append { get; internal set; }
+    /// <summary>
+    ///   Boot builder after creation.
+    /// </summary>
+    public virtual bool? Bootstrap { get; internal set; }
+    /// <summary>
+    ///   Flags for buildkitd daemon.
+    /// </summary>
+    public virtual string BuildKitDaemonFlags { get; internal set; }
+    /// <summary>
+    ///   Flags for buildkitd daemon.
+    /// </summary>
+    public virtual string BuildKitDFlags { get; internal set; }
+    /// <summary>
+    ///   BuildKit config file.
+    /// </summary>
+    public virtual string Config { get; internal set; }
+    /// <summary>
+    ///   Driver to use (available: <c>docker-container</c>, <c>kubernetes</c>, <c>remote</c>).
+    /// </summary>
+    public virtual DriverType Driver { get; internal set; }
+    /// <summary>
+    ///   Options for the driver.
+    /// </summary>
+    public virtual string DriverOpt { get; internal set; }
+    /// <summary>
+    ///   Remove a node from builder instead of changing it.
+    /// </summary>
+    public virtual bool? Leave { get; internal set; }
+    /// <summary>
+    ///   Builder instance name.
+    /// </summary>
+    public virtual string Name { get; internal set; }
+    /// <summary>
+    ///   Create/modify node with given name.
+    /// </summary>
+    public virtual string Node { get; internal set; }
+    /// <summary>
+    ///   Fixed platforms for current node.
+    /// </summary>
+    public virtual string Platform { get; internal set; }
+    /// <summary>
+    ///   Set the current builder instance.
+    /// </summary>
+    public virtual bool? Use { get; internal set; }
+    protected override Arguments ConfigureProcessArguments(Arguments arguments)
+    {
+        arguments
+          .Add("buildx create")
+          .Add("--append", Append)
+          .Add("--bootstrap", Bootstrap)
+          .Add("--buildkitd-flags {value}", BuildKitDaemonFlags)
+          .Add("--buildkitd-flags {value}", BuildKitDFlags)
+          .Add("--config {value}", Config)
+          .Add("--driver {value}", Driver)
+          .Add("--driver-opt {value}", DriverOpt)
+          .Add("--leave", Leave)
+          .Add("--name {value}", Name)
+          .Add("--node {value}", Node)
+          .Add("--platform {value}", Platform)
+          .Add("--use", Use)
+          .Add("{value}", GetCliSettings(), customValue: true);
+        return base.ConfigureProcessArguments(arguments);
+    }
+}
+#endregion
 #region DockerStatsSettings
 /// <summary>
 ///   Used within <see cref="DockerTasks"/>.
@@ -74499,6 +74664,436 @@ public static T ResetPath<T>(this T toolSettings) where T : DockerBuildxBuildSet
     #endregion
 }
 #endregion
+#region DockerBuildxCreateSettingsExtensions
+/// <summary>
+///   Used within <see cref="DockerTasks"/>.
+/// </summary>
+[PublicAPI]
+[ExcludeFromCodeCoverage]
+public static partial class DockerBuildxCreateSettingsExtensions
+{
+    #region Append
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Append"/></em></p>
+    ///   <p>Append a node to builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T SetAppend<T>(this T toolSettings, bool? append) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Append = append;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Append"/></em></p>
+    ///   <p>Append a node to builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetAppend<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Append = null;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Enables <see cref="DockerBuildxCreateSettings.Append"/></em></p>
+    ///   <p>Append a node to builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T EnableAppend<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Append = true;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Disables <see cref="DockerBuildxCreateSettings.Append"/></em></p>
+    ///   <p>Append a node to builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T DisableAppend<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Append = false;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Toggles <see cref="DockerBuildxCreateSettings.Append"/></em></p>
+    ///   <p>Append a node to builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T ToggleAppend<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Append = !toolSettings.Append;
+        return toolSettings;
+    }
+    #endregion
+    #region Bootstrap
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Bootstrap"/></em></p>
+    ///   <p>Boot builder after creation.</p>
+    /// </summary>
+    [Pure]
+    public static T SetBootstrap<T>(this T toolSettings, bool? bootstrap) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Bootstrap = bootstrap;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Bootstrap"/></em></p>
+    ///   <p>Boot builder after creation.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetBootstrap<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Bootstrap = null;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Enables <see cref="DockerBuildxCreateSettings.Bootstrap"/></em></p>
+    ///   <p>Boot builder after creation.</p>
+    /// </summary>
+    [Pure]
+    public static T EnableBootstrap<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Bootstrap = true;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Disables <see cref="DockerBuildxCreateSettings.Bootstrap"/></em></p>
+    ///   <p>Boot builder after creation.</p>
+    /// </summary>
+    [Pure]
+    public static T DisableBootstrap<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Bootstrap = false;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Toggles <see cref="DockerBuildxCreateSettings.Bootstrap"/></em></p>
+    ///   <p>Boot builder after creation.</p>
+    /// </summary>
+    [Pure]
+    public static T ToggleBootstrap<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Bootstrap = !toolSettings.Bootstrap;
+        return toolSettings;
+    }
+    #endregion
+    #region BuildKitDaemonFlags
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.BuildKitDaemonFlags"/></em></p>
+    ///   <p>Flags for buildkitd daemon.</p>
+    /// </summary>
+    [Pure]
+    public static T SetBuildKitDaemonFlags<T>(this T toolSettings, string buildKitDaemonFlags) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.BuildKitDaemonFlags = buildKitDaemonFlags;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.BuildKitDaemonFlags"/></em></p>
+    ///   <p>Flags for buildkitd daemon.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetBuildKitDaemonFlags<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.BuildKitDaemonFlags = null;
+        return toolSettings;
+    }
+    #endregion
+    #region BuildKitDFlags
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.BuildKitDFlags"/></em></p>
+    ///   <p>Flags for buildkitd daemon.</p>
+    /// </summary>
+    [Pure]
+    public static T SetBuildKitDFlags<T>(this T toolSettings, string buildKitDFlags) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.BuildKitDFlags = buildKitDFlags;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.BuildKitDFlags"/></em></p>
+    ///   <p>Flags for buildkitd daemon.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetBuildKitDFlags<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.BuildKitDFlags = null;
+        return toolSettings;
+    }
+    #endregion
+    #region Config
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Config"/></em></p>
+    ///   <p>BuildKit config file.</p>
+    /// </summary>
+    [Pure]
+    public static T SetConfig<T>(this T toolSettings, string config) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Config = config;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Config"/></em></p>
+    ///   <p>BuildKit config file.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetConfig<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Config = null;
+        return toolSettings;
+    }
+    #endregion
+    #region Driver
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Driver"/></em></p>
+    ///   <p>Driver to use (available: <c>docker-container</c>, <c>kubernetes</c>, <c>remote</c>).</p>
+    /// </summary>
+    [Pure]
+    public static T SetDriver<T>(this T toolSettings, DriverType driver) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Driver = driver;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Driver"/></em></p>
+    ///   <p>Driver to use (available: <c>docker-container</c>, <c>kubernetes</c>, <c>remote</c>).</p>
+    /// </summary>
+    [Pure]
+    public static T ResetDriver<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Driver = null;
+        return toolSettings;
+    }
+    #endregion
+    #region DriverOpt
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.DriverOpt"/></em></p>
+    ///   <p>Options for the driver.</p>
+    /// </summary>
+    [Pure]
+    public static T SetDriverOpt<T>(this T toolSettings, string driverOpt) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.DriverOpt = driverOpt;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.DriverOpt"/></em></p>
+    ///   <p>Options for the driver.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetDriverOpt<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.DriverOpt = null;
+        return toolSettings;
+    }
+    #endregion
+    #region Leave
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Leave"/></em></p>
+    ///   <p>Remove a node from builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T SetLeave<T>(this T toolSettings, bool? leave) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Leave = leave;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Leave"/></em></p>
+    ///   <p>Remove a node from builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetLeave<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Leave = null;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Enables <see cref="DockerBuildxCreateSettings.Leave"/></em></p>
+    ///   <p>Remove a node from builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T EnableLeave<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Leave = true;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Disables <see cref="DockerBuildxCreateSettings.Leave"/></em></p>
+    ///   <p>Remove a node from builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T DisableLeave<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Leave = false;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Toggles <see cref="DockerBuildxCreateSettings.Leave"/></em></p>
+    ///   <p>Remove a node from builder instead of changing it.</p>
+    /// </summary>
+    [Pure]
+    public static T ToggleLeave<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Leave = !toolSettings.Leave;
+        return toolSettings;
+    }
+    #endregion
+    #region Name
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Name"/></em></p>
+    ///   <p>Builder instance name.</p>
+    /// </summary>
+    [Pure]
+    public static T SetName<T>(this T toolSettings, string name) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Name = name;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Name"/></em></p>
+    ///   <p>Builder instance name.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetName<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Name = null;
+        return toolSettings;
+    }
+    #endregion
+    #region Node
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Node"/></em></p>
+    ///   <p>Create/modify node with given name.</p>
+    /// </summary>
+    [Pure]
+    public static T SetNode<T>(this T toolSettings, string node) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Node = node;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Node"/></em></p>
+    ///   <p>Create/modify node with given name.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetNode<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Node = null;
+        return toolSettings;
+    }
+    #endregion
+    #region Platform
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Platform"/></em></p>
+    ///   <p>Fixed platforms for current node.</p>
+    /// </summary>
+    [Pure]
+    public static T SetPlatform<T>(this T toolSettings, string platform) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Platform = platform;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Platform"/></em></p>
+    ///   <p>Fixed platforms for current node.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetPlatform<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Platform = null;
+        return toolSettings;
+    }
+    #endregion
+    #region Use
+    /// <summary>
+    ///   <p><em>Sets <see cref="DockerBuildxCreateSettings.Use"/></em></p>
+    ///   <p>Set the current builder instance.</p>
+    /// </summary>
+    [Pure]
+    public static T SetUse<T>(this T toolSettings, bool? use) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Use = use;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Resets <see cref="DockerBuildxCreateSettings.Use"/></em></p>
+    ///   <p>Set the current builder instance.</p>
+    /// </summary>
+    [Pure]
+    public static T ResetUse<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Use = null;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Enables <see cref="DockerBuildxCreateSettings.Use"/></em></p>
+    ///   <p>Set the current builder instance.</p>
+    /// </summary>
+    [Pure]
+    public static T EnableUse<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Use = true;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Disables <see cref="DockerBuildxCreateSettings.Use"/></em></p>
+    ///   <p>Set the current builder instance.</p>
+    /// </summary>
+    [Pure]
+    public static T DisableUse<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Use = false;
+        return toolSettings;
+    }
+    /// <summary>
+    ///   <p><em>Toggles <see cref="DockerBuildxCreateSettings.Use"/></em></p>
+    ///   <p>Set the current builder instance.</p>
+    /// </summary>
+    [Pure]
+    public static T ToggleUse<T>(this T toolSettings) where T : DockerBuildxCreateSettings
+    {
+        toolSettings = toolSettings.NewInstance();
+        toolSettings.Use = !toolSettings.Use;
+        return toolSettings;
+    }
+    #endregion
+}
+#endregion
 #region DockerStatsSettingsExtensions
 /// <summary>
 ///   Used within <see cref="DockerTasks"/>.
@@ -82242,3 +82837,22 @@ public static implicit operator ProgressType(string value)
     }
 }
 #endregion
+#region DriverType
+/// <summary>
+///   Used within <see cref="DockerTasks"/>.
+/// </summary>
+[PublicAPI]
+[Serializable]
+[ExcludeFromCodeCoverage]
+[TypeConverter(typeof(TypeConverter<DriverType>))]
+public partial class DriverType : Enumeration
+{
+    public static DriverType docker_container = (DriverType) "docker-container";
+    public static DriverType kubernetes = (DriverType) "kubernetes";
+    public static DriverType remote = (DriverType) "remote";
+    public static implicit operator DriverType(string value)
+    {
+        return new DriverType { Value = value };
+    }
+}
+#endregion
diff --git a/source/Nuke.Common/Tools/Docker/Docker.json b/source/Nuke.Common/Tools/Docker/Docker.json
index eb66b179b..8f5075e78 100644
--- a/source/Nuke.Common/Tools/Docker/Docker.json
+++ b/source/Nuke.Common/Tools/Docker/Docker.json
@@ -90,6 +90,7 @@
     "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/engine-cli/docker_system_prune.yaml",
     "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/engine-cli/docker_builder.yaml",
     "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/buildx/docker_buildx_build.yaml",
+    "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/buildx/docker_buildx_create.yaml",
     "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/engine-cli/docker_container_pause.yaml",
     "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/engine-cli/docker_container_commit.yaml",
     "https://raw.githubusercontent.com/docker/docker.github.io/50fe61e/_data/engine-cli/docker_context_ls.yaml",
@@ -8515,6 +8516,88 @@
         ]
       }
     },
+    {
+      "help": "Create a new builder instance using Docker Buildx plugin.",
+      "postfix": "BuildxCreate",
+      "definiteArgument": "buildx create",
+      "settingsClass": {
+        "baseClass": "DockerSettings",
+        "properties": [
+          {
+            "name": "Append",
+            "type": "bool",
+            "format": "--append",
+            "help": "Append a node to builder instead of changing it."
+          },
+          {
+            "name": "Bootstrap",
+            "type": "bool",
+            "format": "--bootstrap",
+            "help": "Boot builder after creation."
+          },
+          {
+            "name": "BuildKitDaemonFlags",
+            "type": "string",
+            "format": "--buildkitd-flags {value}",
+            "help": "Flags for buildkitd daemon."
+          },
+          {
+            "name": "BuildKitDFlags",
+            "type": "string",
+            "format": "--buildkitd-flags {value}",
+            "help": "Flags for buildkitd daemon."
+          },
+          {
+            "name": "Config",
+            "type": "string",
+            "format": "--config {value}",
+            "help": "BuildKit config file."
+          },
+          {
+            "name": "Driver",
+            "type": "DriverType",
+            "format": "--driver {value}",
+            "help": "Driver to use (available: <c>docker-container</c>, <c>kubernetes</c>, <c>remote</c>)."
+          },
+          {
+            "name": "DriverOpt",
+            "type": "string",
+            "format": "--driver-opt {value}",
+            "help": "Options for the driver."
+          },
+          {
+            "name": "Leave",
+            "type": "bool",
+            "format": "--leave",
+            "help": "Remove a node from builder instead of changing it."
+          },
+          {
+            "name": "Name",
+            "type": "string",
+            "format": "--name {value}",
+            "help": "Builder instance name."
+          },
+          {
+            "name": "Node",
+            "type": "string",
+            "format": "--node {value}",
+            "help": "Create/modify node with given name."
+          },
+          {
+            "name": "Platform",
+            "type": "string",
+            "format": "--platform {value}",
+            "help": "Fixed platforms for current node."
+          },
+          {
+            "name": "Use",
+            "type": "bool",
+            "format": "--use",
+            "help": "Set the current builder instance."
+          }
+        ]
+      }
+    },
     {
       "help": "Display a live stream of container(s) resource usage statistics.",
       "postfix": "Stats",
@@ -10079,6 +10162,14 @@
         "plain",
         "tty"
       ]
+    },
+    {
+      "name": "DriverType",
+      "values": [
+        "docker-container",
+        "kubernetes",
+        "remote"
+      ]
     }
   ]
 }
diff --git a/source/Nuke.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs b/source/Nuke.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs
index 45c26af21..aafad5c1e 100644
--- a/source/Nuke.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs
+++ b/source/Nuke.Common/Tools/Docker/DockerTargetDefinitionExtensions.cs
@@ -85,7 +85,8 @@ bool IsUpToDate() => build.BuildAssemblyDirectory.GlobFiles("*.dll")
             var envFile = buildAssemblyDirectory / $".env.{definition.Name}";
             var environmentVariables = GetEnvironmentVariables(settings, rootDirectory, tempDirectory);
 
-            envFile.WriteAllLines(environmentVariables.Select(x => $"{x.Key}={x.Value}"));
+            envFile.WriteAllLines(environmentVariables.Where(x => x.Value != null).Select(x => $"{x.Key}={x.Value}")
+                .Concat(environmentVariables.Where(x => x.Value == null).Select(x => x.Key)));
             localTempDirectory.CreateOrCleanDirectory();
 
             if (!settings.Username.IsNullOrEmpty())
@@ -101,25 +102,23 @@ bool IsUpToDate() => build.BuildAssemblyDirectory.GlobFiles("*.dll")
 
             try
             {
-                using (DelegateDisposable.SetAndRestore(() => DockerLogger, (_, message) => Log.Write(LogEventReader.ReadFromString(message))))
-                {
-                    Log.Information("Launching target in {Image}...", settings.Image);
-                    DockerTasks.DockerRun(_ => settings
-                        .When(!settings.Rm.HasValue, _ => _
-                            .EnableRm())
-                        .AddVolume($"{build.RootDirectory}:{rootDirectory}")
-                        .AddVolume($"{NuGetPackageResolver.GetPackagesDirectory(NuGetToolPathResolver.NuGetPackagesConfigFile)}:{nugetDirectory}")
-                        .SetPlatform(settings.Platform)
-                        .SetWorkdir(rootDirectory)
-                        .SetEnvFile(envFile)
-                        .SetEntrypoint(rootDirectory / build.RootDirectory.GetRelativePathTo(buildAssembly))
-                        .SetArgs(new[]
-                                 {
-                                     definition.Target.Name,
-                                     $"--{ParameterService.GetParameterDashedName(Constants.SkippedTargetsParameterName)}"
-                                 }.Concat(settings.Args))
-                        .DisableProcessLogInvocation());
-                }
+                Log.Information("Launching target in {Image}...", settings.Image);
+                DockerTasks.DockerRun(_ => settings
+                    .When(!settings.Rm.HasValue, _ => _
+                        .EnableRm())
+                    .AddVolume($"{build.RootDirectory}:{rootDirectory}")
+                    .AddVolume($"{NuGetPackageResolver.GetPackagesDirectory(NuGetToolPathResolver.NuGetPackagesConfigFile)}:{nugetDirectory}")
+                    .SetPlatform(settings.Platform)
+                    .SetWorkdir(rootDirectory)
+                    .SetEnvFile(envFile)
+                    .SetEntrypoint(rootDirectory / build.RootDirectory.GetRelativePathTo(buildAssembly))
+                    .SetArgs(new[]
+                             {
+                                 definition.Target.Name,
+                                 $"--{ParameterService.GetParameterDashedName(Constants.SkippedTargetsParameterName)}"
+                             }.Concat(settings.Args))
+                    .DisableProcessLogInvocation()
+                    .SetProcessLogger((_, message) => Log.Write(LogEventReader.ReadFromString(message))));
             }
             finally
             {
@@ -164,14 +163,18 @@ private static IReadOnlyDictionary<string, string> GetEnvironmentVariables(
                 "USERPROFILE",
             };
 
+        settings.ProcessEnvironmentVariables.Where(x => x.Value.Contains(EnvironmentInfo.NewLine))
+            .ForEach(x => Log.Warning("Environment variable {Variable} contains newlines and cannot be passed to Docker", x.Key));
+
         return customEnvironmentVariables
             .AddDictionary(settings.ProcessEnvironmentVariables
                 .Where(x =>
                     !customEnvironmentVariables.Keys.Contains(x.Key, StringComparer.OrdinalIgnoreCase) &&
                     // TODO: Copy from TeamCity?
                     !x.Key.Contains(' ') &&
-                    !x.Key.EqualsAnyOrdinalIgnoreCase(excludedEnvironmentVariables))
-                .ToDictionary(x => x.Key, x => x.Value).AsReadOnly())
+                    !x.Key.EqualsAnyOrdinalIgnoreCase(excludedEnvironmentVariables) &&
+                    !x.Value.Contains(EnvironmentInfo.NewLine))
+                .ToDictionary(x => x.Key, _ => default(string)).AsReadOnly())
             .ToImmutableSortedDictionary();
     }
 }