diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8127890f..29200204 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,14 @@ Grafana Collection Release Notes
 .. contents:: Topics
 
 
+v1.2.1
+======
+
+Bugfixes
+--------
+
+- Fix issue with grafana_user that failed to create admin user (#142)
+
 v1.2.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index ecf18743..2657206c 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -70,3 +70,10 @@ releases:
     fragments:
     - 1.2.0.yml
     release_date: '2021-02-15'
+  1.2.1:
+    changes:
+      bugfixes:
+      - Fix issue with grafana_user that failed to create admin user (#142)
+    fragments:
+    - 1.2.1.yml
+    release_date: '2021-04-11'
diff --git a/changelogs/fragments/1.2.1.yml b/changelogs/fragments/1.2.1.yml
new file mode 100644
index 00000000..fddcfe66
--- /dev/null
+++ b/changelogs/fragments/1.2.1.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- Fix issue with grafana_user that failed to create admin user (#142)
diff --git a/galaxy.yml b/galaxy.yml
index 9261d772..fd075e5d 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: community
 name: grafana
-version: 1.2.0
+version: 1.2.1
 readme: README.md
 authors:
 - Rémi REY (@rrey)