diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0548950..94ea6611 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,51 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Added
+
+### Changed
+
+### Fixed
+
+### Security
+
+## [0.9.6] - 2020-07-17
+
+### Added
+
+- slug for fields to be able to set value by url parameter
+- form submission hokks
+- default index.html for api without bundled ui
+- slug for form fields can now be saved
+- submission webhooks with ability to customize json payload
+  ```
+  {
+    form: ID
+    submission: ID
+    created: DateTime
+    lastModified: DateTime
+    fields: [
+        {
+            field: ID
+            slug: String
+            value: any
+        }
+    ]
+  }
+  ```
+  
 ### Changed
 
 - minify containers to reduce layer size
 
 ### Fixed
+
+- bug in settings resolver with nullable fields
+- bug if user was deleted and form still exists
+- do not show login note if it is not set
+- typo in dropdown options https://github.com/ohmyform/ohmyform/issues/96
+- query parms are not parsed https://github.com/ohmyform/ui/pull/27 https://github.com/ohmyform/ohmyform/issues/100
+- errors because of missing user reference (https://github.com/ohmyform/ohmyform/issues/102)
+
 ### Security
 
 - container now runs as non root user
diff --git a/api b/api
index 99fd0b4d..b3ba5cfc 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 99fd0b4dc7412e72ca3324810cc1baf6a7790c21
+Subproject commit b3ba5cfc5131db3bcf51fbe963c294d54c9ee495
diff --git a/ui b/ui
index 84f23706..78cadf09 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit 84f23706b5dbea2f77890b8836065892fc2a180b
+Subproject commit 78cadf0942e87d91c03efdfe6c65be6c54a60777