diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66b6f1e0..f9783eb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.21.1
+
+**Release date:** 2022-03-23
+
+This prerelease fixes a bug introduced in `v0.21.0`, where pushes into a branch
+different from the origin branch would squash all historical commits into one.
+
+In addition, it ensures the API objects fully adhere to newly introduced
+interfaces, allowing them to work in combination with e.g. the
+[`conditions`](https://pkg.go.dev/github.com/fluxcd/pkg/runtime@v0.13.2/conditions)
+package.
+
+Improvements:
+- Implement `meta.ObjectWithConditions` interfaces
+  [#328](https://github.com/fluxcd/image-automation-controller/pull/328)
+- Update image-reflector-controller API to v0.17.1
+  [#331](https://github.com/fluxcd/image-automation-controller/pull/331)
+- Update source-controller to v0.22.2
+  [#333](https://github.com/fluxcd/image-automation-controller/pull/333)
+
+Fixes:
+- Fix bug when pushing into different branch
+  [#330](https://github.com/fluxcd/image-automation-controller/pull/330)
+
 ## 0.21.0
 
 **Release date:** 2022-03-22
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 9f46a997..eca14ba8 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ resources:
 images:
 - name: fluxcd/image-automation-controller
   newName: fluxcd/image-automation-controller
-  newTag: v0.21.0
+  newTag: v0.21.1
diff --git a/go.mod b/go.mod
index c1212c51..ede327a5 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f
 	github.com/cyphar/filepath-securejoin v0.2.3
-	github.com/fluxcd/image-automation-controller/api v0.21.0
+	github.com/fluxcd/image-automation-controller/api v0.21.1
 	// If you bump this, change REFLECTOR_VER in the Makefile to match
 	github.com/fluxcd/image-reflector-controller/api v0.17.1
 	github.com/fluxcd/pkg/apis/acl v0.0.3