diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ef893f8..ac86a0f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,12 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Removed
 ### Fixed
 
+## [0.12.1] - 2021-12-22
+### Changed
+ * Bump https://github.com/bitpoke/build to 0.7.1
+### Fixed
+ * Fix the app version in the published Helm charts
+
 ## [0.12.0] - 2021-12-22
 ### Added
 ### Changed
diff --git a/Makefile b/Makefile
index a93caf3b..36434db6 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ include build/makelib/helm.mk
 	@set -e; \
 		for crd in $(wildcard $(CRD_DIR)/*.yaml) ; do \
 			cp $${crd} $(HELM_CHARTS_DIR)/wordpress-operator/crds/ ; \
-			$(YQ) e '.metadata.labels["app"]="wordpress-operator"'        -i $(HELM_CHARTS_DIR)/wordpress-operator/crds/$$(basename $${crd}) ; \
-			$(YQ) e 'del(.metadata.creationTimestamp)'                    -i $(HELM_CHARTS_DIR)/wordpress-operator/crds/$$(basename $${crd}) ; \
-			$(YQ) e 'del(.status)'                                        -i $(HELM_CHARTS_DIR)/wordpress-operator/crds/$$(basename $${crd}) ; \
+			$(YQ) e '.metadata.labels["app.kubernetes.io/name"]="wordpress-operator"' -i $(HELM_CHARTS_DIR)/wordpress-operator/crds/$$(basename $${crd}) ; \
+			$(YQ) e 'del(.metadata.creationTimestamp)'                                -i $(HELM_CHARTS_DIR)/wordpress-operator/crds/$$(basename $${crd}) ; \
+			$(YQ) e 'del(.status)'                                                    -i $(HELM_CHARTS_DIR)/wordpress-operator/crds/$$(basename $${crd}) ; \
 		done
 	@echo '{{- if .Values.rbac.create }}'                                 > $(HELM_CHARTS_DIR)/wordpress-operator/templates/clusterrole.yaml
 	@echo 'apiVersion: rbac.authorization.k8s.io/v1'                     >> $(HELM_CHARTS_DIR)/wordpress-operator/templates/clusterrole.yaml
@@ -72,7 +72,7 @@ include build/makelib/helm.mk
 .PHONY: .helm.package.prepare.wordpress-operator
 .helm.package.prepare.wordpress-operator:  $(YQ)
 	@$(INFO) prepare wordpress-operator chart $(HELM_CHART_VERSION)
-	@$(YQ) e '.image="$(DOCKER_REGISTRY)/wordpress-operator:$(IMAGE_TAG)"' -i $(HELM_CHARTS_WORK_DIR)/wordpress-operator/values.yaml
+	@$(YQ) e '.image.repository="$(DOCKER_REGISTRY)/wordpress-operator"' -i $(HELM_CHARTS_WORK_DIR)/wordpress-operator/values.yaml
 	@$(SED) 's/:latest/:$(IMAGE_TAG)/g' $(HELM_CHARTS_WORK_DIR)/wordpress-operator/Chart.yaml
 	@$(OK) prepare wordpress-operator chart $(HELM_CHART_VERSION)
 .helm.package.run.wordpress-operator: .helm.package.prepare.wordpress-operator
diff --git a/deploy/charts/wordpress-operator/crds/wordpress.presslabs.org_wordpresses.yaml b/deploy/charts/wordpress-operator/crds/wordpress.presslabs.org_wordpresses.yaml
index 4476af64..40b32713 100644
--- a/deploy/charts/wordpress-operator/crds/wordpress.presslabs.org_wordpresses.yaml
+++ b/deploy/charts/wordpress-operator/crds/wordpress.presslabs.org_wordpresses.yaml
@@ -5,7 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.7.0
   name: wordpresses.wordpress.presslabs.org
   labels:
-    app: wordpress-operator
+    app.kubernetes.io/name: wordpress-operator
 spec:
   group: wordpress.presslabs.org
   names: