diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66cddee910..1a5ebc0a3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,23 @@
Changes that happened in releases
-## 1.6.12-SNAPSHOT
+## 1.6.13-SNAPSHOT
+
+### New features
+
+None yet
+
+### Bug fixes
+
+None yet
+
+### Backwards-incompatible changes
+
+None yet
+
+## 1.6.12
+
+02/08/2024 - [Release tag](https://github.com/Blazebit/blaze-persistence/releases/tag/1.6.12) [Resolved issues](https://github.com/Blazebit/blaze-persistence/issues?q=is%3Aissue+milestone%3A1.6.12+is%3Aclosed+sort%3Aupdated-desc)
### New features
@@ -16,7 +32,7 @@ Changes that happened in releases
* Fix `CAST_STRING` for SQL Server
* Ensure Spring Jackson integration copies `ObjectMapper` bean
* Fix entity view processor generated code for `@MappingSingular` leading to compilation error
-* Fix `MULTISET` issues with temporal `BasicUserType`
+* Fix `MULTISET` issues with temporal `BasicUserType`
### Backwards-incompatible changes
diff --git a/README.md b/README.md
index 36702fb49e..8828343141 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Blaze-Persistence is split up into different modules. We recommend that you defi
```xml
- 1.6.11
+ 1.6.12
```
@@ -84,49 +84,49 @@ If you want a sample application with everything setup where you can poke around
Core-only archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-core-sample" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-core-sample" "-DarchetypeVersion=1.6.12"
```
Entity view archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-entity-view-sample" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-entity-view-sample" "-DarchetypeVersion=1.6.12"
```
Spring-Data archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-spring-data-sample" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-spring-data-sample" "-DarchetypeVersion=1.6.12"
```
Spring-Boot archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-spring-boot-sample" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-spring-boot-sample" "-DarchetypeVersion=1.6.12"
```
DeltaSpike Data archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-deltaspike-data-sample" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-deltaspike-data-sample" "-DarchetypeVersion=1.6.12"
```
Java EE archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-java-ee-sample" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-java-ee-sample" "-DarchetypeVersion=1.6.12"
```
Core-only Jakarta archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-core-sample-jakarta" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-core-sample-jakarta" "-DarchetypeVersion=1.6.12"
```
Entity view Jakarta archetype:
```bash
-mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-entity-view-sample-jakarta" "-DarchetypeVersion=1.6.11"
+mvn archetype:generate "-DarchetypeGroupId=com.blazebit" "-DarchetypeArtifactId=blaze-persistence-archetype-entity-view-sample-jakarta" "-DarchetypeVersion=1.6.12"
```
## Supported Java runtimes
diff --git a/documentation/pom.xml b/documentation/pom.xml
index 74e4cca620..23ec48be70 100644
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -32,7 +32,7 @@
1.6.0-alpha.7
- 1.6.11
+ 1.6.12
1.6
diff --git a/website/pom.xml b/website/pom.xml
index dc51c39ad2..5cda5c98ba 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -32,10 +32,10 @@
- 1.6.11
+ 1.6.12
1.6
- 1.6.12-SNAPSHOT
+ 1.6.13-SNAPSHOT
yyyyMMddHHmmssSSSS
diff --git a/website/src/main/jbake/content/downloads.adoc b/website/src/main/jbake/content/downloads.adoc
index ff175359b0..93cfdd3a47 100644
--- a/website/src/main/jbake/content/downloads.adoc
+++ b/website/src/main/jbake/content/downloads.adoc
@@ -9,7 +9,7 @@
[.releases]
|===
-| 1.6.11 | 2024-01-10 | https://github.com/Blazebit/blaze-persistence/releases/download/1.6.11/blaze-persistence-dist-1.6.11.zip[*Download*, window="_blank"] | link:news/2024/blaze-persistence-1.6.11-release.html[More...]
+| 1.6.12 | 2024-08-02 | https://github.com/Blazebit/blaze-persistence/releases/download/1.6.12/blaze-persistence-dist-1.6.12.zip[*Download*, window="_blank"] | link:news/2024/blaze-persistence-1.6.12-release.html[More...]
| 1.5.1 | 2020-09-14 | https://github.com/Blazebit/blaze-persistence/releases/download/1.5.1/blaze-persistence-dist-1.5.1.zip[*Download*, window="_blank"] | link:news/2020/blaze-persistence-1.5.1-release.html[More...]
| 1.4.1 | 2020-01-28 | https://github.com/Blazebit/blaze-persistence/releases/download/1.4.1/blaze-persistence-dist-1.4.1.zip[*Download*, window="_blank"] | link:news/2020/blaze-persistence-1.4.1-release.html[More...]
| 1.3.2 | 2019-02-26 | https://github.com/Blazebit/blaze-persistence/releases/download/1.3.2/blaze-persistence-dist-1.3.2.zip[*Download*, window="_blank"] | link:news/2019/blaze-persistence-1.3.2-release.html[More...]
diff --git a/website/src/main/jbake/content/news/2024/blaze-persistence-1.6.12-release.adoc b/website/src/main/jbake/content/news/2024/blaze-persistence-1.6.12-release.adoc
new file mode 100644
index 0000000000..dd3594176b
--- /dev/null
+++ b/website/src/main/jbake/content/news/2024/blaze-persistence-1.6.12-release.adoc
@@ -0,0 +1,33 @@
+= Blaze-Persistence 1.6.12 Release
+Christian Beikov
+2024-08-02 0
+:description: Blaze-Persistence version 1.6.12 was just released
+:page: news
+:icon: christian_head.png
+:jbake-tags: announcement,release
+:jbake-type: post
+:jbake-status: published
+:linkattrs:
+
+We are happy to announce the twelfth bug fix release of the 1.6 series.
+
+=== Hibernate ORM 6.6 compatibility
+
+So far, the Hibernate ORM 6 integration was tested against Hibernate ORM 6.4.
+The CI was now updated to also test against ORM 6.5 and 6.6.
+
+=== Spring Data 3.3 integration
+
+Thanks to https://github.com/EugenMayer[Eugen Mayer, window="_blank"] and Andrius Juozapaitis there is now
+a new integration module++++++ for Spring Data 3.3.
+
+=== Concurrency issue in Entity View Updater initialization
+
+When Entity View Updaters are created concurrently where one depends on another, there is the possibility of a
+`NullPointerException` which was now fixed.
+
+=== Various bug fixes
+
+Take a look into the https://github.com/Blazebit/blaze-persistence/blob/main/CHANGELOG.md#1612[changelog, window="_blank"] for a full list of changes and improvements.
+
+Enjoy the release and stay tuned for the next one!
\ No newline at end of file
diff --git a/website/src/main/jbake/jbake.properties b/website/src/main/jbake/jbake.properties
index 5379739240..7b82cdfee1 100644
--- a/website/src/main/jbake/jbake.properties
+++ b/website/src/main/jbake/jbake.properties
@@ -17,7 +17,7 @@
site.host=http://localhost:8820/
asciidoctor.attributes.export=true
asciidoctor.attributes=imagesdir=images,source-highlighter=prettify
-stable.version=1.6.11
+stable.version=1.6.12
template.index.file=index.ftl
template.downloads.file=downloads.ftl
render.tags=true