diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index c5df6b375..eb7da7ced 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -17,7 +17,7 @@ trap "cleanup" EXIT SIGINT
 
 bash "${CODEGEN_PKG}/generate-groups.sh" all \
   "${OPERATOR_PACKAGE_ROOT}/pkg/generated" "${OPERATOR_PACKAGE_ROOT}/pkg/apis" \
-  "zalando.org:v1alpha1" \
+  "acid.zalan.do:v1 zalando.org:v1alpha1" \
   --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt
 
 cp -r "${OPERATOR_PACKAGE_ROOT}"/pkg/* "${TARGET_CODE_DIR}"
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
index 73a3863db..3d6282a0a 100644
--- a/pkg/generated/clientset/versioned/clientset.go
+++ b/pkg/generated/clientset/versioned/clientset.go
@@ -80,6 +80,9 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	var cs Clientset
 	var err error
 	cs.acidV1, err = acidv1.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 	cs.zalandoV1alpha1, err = zalandov1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go
index 23515c041..a58a2ec24 100644
--- a/pkg/generated/informers/externalversions/generic.go
+++ b/pkg/generated/informers/externalversions/generic.go
@@ -65,7 +65,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case v1.SchemeGroupVersion.WithResource("postgresqls"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Acid().V1().Postgresqls().Informer()}, nil
 
-	// Group=zalando.org, Version=v1alpha1
+		// Group=zalando.org, Version=v1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("fabriceventstreams"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Zalando().V1alpha1().FabricEventStreams().Informer()}, nil