diff --git a/pkg/controller/catalog/catalog_controller.go b/pkg/controller/catalog/catalog_controller.go
index 44b9a0cd49..7a8a0bbb43 100644
--- a/pkg/controller/catalog/catalog_controller.go
+++ b/pkg/controller/catalog/catalog_controller.go
@@ -41,7 +41,7 @@ import (
 	"github.com/apache/camel-k/pkg/util/monitoring"
 )
 
-// Add creates a new catalog Controller and adds it to the Manager. The Manager will set fields on the Controller
+// Add creates a new Catalog Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(ctx context.Context, mgr manager.Manager, c client.Client) error {
 	return add(mgr, newReconciler(mgr, c))
@@ -49,7 +49,7 @@ func Add(ctx context.Context, mgr manager.Manager, c client.Client) error {
 
 func newReconciler(mgr manager.Manager, c client.Client) reconcile.Reconciler {
 	return monitoring.NewInstrumentedReconciler(
-		&reconcilecatalog{
+		&reconcileCatalog{
 			client:   c,
 			scheme:   mgr.GetScheme(),
 			recorder: mgr.GetEventRecorderFor("camel-k-catalog-controller"),
@@ -94,10 +94,10 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 		Complete(r)
 }
 
-var _ reconcile.Reconciler = &reconcilecatalog{}
+var _ reconcile.Reconciler = &reconcileCatalog{}
 
 // reconcilecatalog reconciles a catalog object.
-type reconcilecatalog struct {
+type reconcileCatalog struct {
 	// This client, initialized using mgr.Client() above, is a split client
 	// that reads objects from the cache and writes to the API server
 	client   client.Client
@@ -110,7 +110,7 @@ type reconcilecatalog struct {
 // Note:
 // The Controller will requeue the Request to be processed again if the returned error is non-nil or
 // Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
-func (r *reconcilecatalog) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
+func (r *reconcileCatalog) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 	rlog := Log.WithValues("request-namespace", request.Namespace, "request-name", request.Name)
 	rlog.Info("Reconciling CamelCatalog")
 
diff --git a/pkg/controller/catalog/initialize.go b/pkg/controller/catalog/initialize.go
index f67594b1d4..8673536397 100644
--- a/pkg/controller/catalog/initialize.go
+++ b/pkg/controller/catalog/initialize.go
@@ -114,8 +114,6 @@ func initialize(options spectrum.Options, registryAddress string, catalog *v1.Ca
 	// Now we properly set the base and the target image
 	options.Base = catalog.Spec.GetQuarkusToolingImage()
 	options.Target = imageName
-	// TODO properly build in the container withouth being root
-	options.RunAs = "0"
 
 	err := buildRuntimeBuilderImage(options)
 
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 6075133d35..03816f51b2 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -427,9 +427,9 @@ var assets = func() http.FileSystem {
 		"/rbac/operator-role.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "operator-role.yaml",
 			modTime:          time.Time{},
-			uncompressedSize: 2952,
+			uncompressedSize: 3042,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\xc1\x6e\xdb\x46\x10\xbd\xf3\x2b\x06\xe2\x25\x01\x2c\xa9\xed\xa9\x50\x4f\x6a\x62\xb7\x42\x03\x09\xb0\x94\x06\x39\x0e\x97\x23\x6a\xaa\xe5\xce\x76\x76\x69\x59\xfd\xfa\x62\x29\x32\x92\x4d\x2b\x28\x9a\xa0\xa9\x2e\x5e\xee\x8e\xdf\xbc\x79\xef\x2d\xc1\x1c\xc6\x5f\xef\x97\xe5\xf0\x8e\x0d\xb9\x40\x25\x44\x81\xb8\x23\x98\x7b\x34\x3b\x82\xb5\x6c\xe3\x01\x95\xe0\x4e\x1a\x57\x62\x64\x71\xf0\x6a\xbe\xbe\x7b\x0d\x8d\x2b\x49\x41\x1c\x81\x28\xd4\xa2\x94\xe5\x60\xc4\x45\xe5\xa2\x89\xa2\x60\x4f\x80\x80\x95\x12\xd5\xe4\x62\x98\x00\xac\x89\x5a\xf4\xe5\x6a\xb3\x78\x73\x0b\x5b\xb6\x04\x25\x87\xd3\x3f\x51\x09\x07\x8e\xbb\x2c\x87\xb8\xe3\x00\x07\xd1\x3d\x6c\x45\x01\xcb\x92\x53\x63\xb4\xc0\x6e\x2b\x5a\x9f\x68\x28\x55\xa8\x25\xbb\x0a\x8c\xf8\xa3\x72\xb5\x8b\x20\x07\x47\x1a\x76\xec\x27\x59\x0e\x9b\x34\xc6\xfa\xae\x67\x12\x4e\xb0\x6d\xcf\x28\xf0\x51\x9a\x6e\x86\x8b\x71\x3b\x15\x6e\xe0\x77\xd2\x90\x9a\xfc\x30\xf9\x2e\xcb\xe1\x55\x2a\x19\x75\x87\xa3\xd7\x3f\xc1\x51\x1a\xa8\xf1\x08\x4e\x22\x34\x81\x2e\x90\xe9\xd1\x90\x8f\xc0\x0e\x8c\xd4\xde\x32\x3a\x43\xe7\xb1\x3e\x75\x98\x40\x4b\x20\x61\x48\x11\x91\x1d\x60\x3b\x06\xc8\xf6\xb2\x0c\x30\x66\x79\x96\x43\xfb\xdb\xc5\xe8\x67\xd3\xe9\xe1\x70\x98\x60\x4b\x77\x22\x5a\x4d\xfb\xe9\xa6\xef\x16\x6f\x6e\x97\xeb\xdb\x71\x4b\x39\xcb\xe1\xbd\xb3\x14\x02\x28\xfd\xd9\xb0\x52\x09\xc5\x11\xd0\x7b\xcb\x06\x0b\x4b\x60\xf1\x90\x8c\x6b\xdd\x69\x4d\x67\x07\x07\xe5\xc8\xae\xba\x81\xd0\xb9\x9e\xe5\x4f\xdc\x39\xcb\xd5\xd3\xe3\xf0\xa4\x40\x1c\xa0\x83\xd1\x7c\x0d\x8b\xf5\x08\x7e\x9e\xaf\x17\xeb\x9b\x2c\x87\x0f\x8b\xcd\xaf\xab\xf7\x1b\xf8\x30\xbf\xbf\x9f\x2f\x37\x8b\xdb\x35\xac\xee\xe1\xcd\x6a\xf9\x76\xb1\x59\xac\x96\x6b\x58\xdd\xc1\x7c\xf9\x11\x7e\x5b\x2c\xdf\xde\x00\x71\xdc\x91\x02\x3d\x7a\x4d\xfc\x45\x81\x93\x90\x54\x26\x4f\xfb\x00\xf5\x04\x52\x3e\xd2\x73\xf0\x64\x78\xcb\x06\x2c\xba\xaa\xc1\x8a\xa0\x92\x07\x52\x97\xe2\xe1\x49\x6b\x0e\xc9\xce\x00\xe8\xca\x2c\x07\xcb\x35\xc7\x36\x45\x61\x38\x54\x6a\xf3\x35\xef\x56\xb6\x67\x57\xce\xe0\x5e\x2c\x65\xe8\xb9\x4b\xd6\x0c\xb4\x40\x33\xc1\x26\xee\x44\xf9\xaf\x96\xcc\x64\xff\x63\x98\xb0\x4c\x1f\xbe\xcf\x6a\x8a\x58\x62\xc4\x59\x06\xe0\xb0\xa6\x19\x18\xac\xc9\x8e\xf7\x63\xf1\xa4\x18\x45\x33\x00\x8b\x05\xd9\x90\x4a\x20\x59\x3b\x83\x51\x57\x34\xca\xb4\xb1\x14\x66\xd9\x18\xd0\xf3\x2f\x2a\x8d\x6f\xcb\xc6\x27\x94\x8b\xf8\x64\x00\x4a\x41\x1a\x35\xd4\x55\x14\x0d\xdb\x32\x9c\x8b\x0d\x46\xb4\x52\x9d\x76\xd8\x45\xaa\xb4\x25\xbb\xe7\x38\xd8\xf3\x16\x63\xba\xa0\x83\x83\xd3\xc6\x3e\xe1\x51\x2c\xd8\xa5\x6b\xfb\x64\x2f\x3d\x3c\x90\x16\x3d\x4d\x25\x8c\xd4\x2e\x2b\x8a\xed\x5f\xcb\xe1\xb4\xf0\x18\xcd\xae\x5d\x35\xbe\xec\xab\x0e\xed\xe6\x97\x8c\x7b\xd1\xbd\x4c\x8c\xe8\xdf\xa3\x4d\x43\xc4\xd8\xbc\xa0\xe1\xe5\xc1\x33\x29\xaf\x1c\x7d\x52\xf4\xca\x79\x98\x06\x83\x96\x5e\xd8\x3e\x97\x3f\x93\xfd\xb3\x47\x9f\xc0\x7a\x5f\xce\xd5\x17\x02\xf5\x9e\x0c\xac\x18\x48\x36\x1a\x0d\x45\xf2\xd2\xe5\x2b\x90\x3e\xb0\xa1\xd3\x03\xb9\xd2\x0b\xbb\x2e\x54\x3e\xdd\x92\x10\xc9\xc5\x07\xb1\x4d\x4d\xc6\x22\x77\xb1\x32\xe2\xb6\x5c\xd5\xe8\x7b\x10\xa3\x14\x9f\x00\xa2\x31\xd2\xb8\xcf\x64\xaa\x33\xf8\xbc\x34\x62\x2d\x99\xa4\xdc\x97\x67\xee\xda\xc8\x53\x7a\x24\xf3\x22\xa5\x7f\x0e\xe1\x55\x1e\x8f\x43\x2f\x06\x00\x5e\x2c\x9b\xe3\x8b\x20\x25\x07\x6d\x7c\x1a\xb5\x68\xca\xea\x73\x37\xef\x42\xa5\x5e\x90\x8b\xe9\x5f\xd0\xe6\x8a\x20\x57\x5f\x74\x43\x7e\x2a\xb6\x8b\x43\x5a\x3d\x79\x51\x18\xdb\x84\x48\xfa\x6c\xff\x1b\xf8\x8b\xbe\x4d\xde\x33\xe6\x25\x79\x2b\xc7\xf6\x3b\xe7\xdb\xd0\x2a\xba\xda\x67\xbc\x8c\x8a\xfb\x43\x8a\xff\x17\xa9\x21\xa1\x41\x97\x2b\x80\x8e\x62\xfa\x2e\x64\x57\x5d\xcd\x10\xbb\x2a\x7d\x38\xd0\x7f\x33\xf2\xdf\x01\x00\x00\xff\xff\x79\x7e\xbd\xcc\x88\x0b\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x41\x6f\xe3\x36\x13\xbd\xeb\x57\x0c\xac\xcb\x2e\x10\xdb\xdf\xd7\x53\xe1\x9e\xdc\xdd\xa4\x35\xba\xb0\x81\xd8\xdb\xc5\x1e\x47\xd4\x58\x9e\x9a\xe2\xb0\x43\x2a\x8e\xfb\xeb\x0b\xca\x72\x6c\x47\x71\x50\x74\x17\x48\x7d\x09\x45\x4e\xde\xbc\x79\xef\x51\x50\x0e\xc3\xef\xf7\xcb\x72\xf8\xc4\x86\x5c\xa0\x12\xa2\x40\xdc\x10\x4c\x3d\x9a\x0d\xc1\x52\xd6\x71\x87\x4a\x70\x27\x8d\x2b\x31\xb2\x38\x78\x37\x5d\xde\xbd\x87\xc6\x95\xa4\x20\x8e\x40\x14\x6a\x51\xca\x72\x30\xe2\xa2\x72\xd1\x44\x51\xb0\x07\x40\xc0\x4a\x89\x6a\x72\x31\x8c\x00\x96\x44\x2d\xfa\x7c\xb1\x9a\x7d\xb8\x85\x35\x5b\x82\x92\xc3\xe1\x9f\xa8\x84\x1d\xc7\x4d\x96\x43\xdc\x70\x80\x9d\xe8\x16\xd6\xa2\x80\x65\xc9\xa9\x31\x5a\x60\xb7\x16\xad\x0f\x34\x94\x2a\xd4\x92\x5d\x05\x46\xfc\x5e\xb9\xda\x44\x90\x9d\x23\x0d\x1b\xf6\xa3\x2c\x87\x55\x1a\x63\x79\x77\x64\x12\x0e\xb0\x6d\xcf\x28\xf0\x55\x9a\x6e\x86\xb3\x71\x3b\x15\x6e\xe0\x77\xd2\x90\x9a\xfc\x30\xfa\x5f\x96\xc3\xbb\x54\x32\xe8\x0e\x07\xef\x7f\x82\xbd\x34\x50\xe3\x1e\x9c\x44\x68\x02\x9d\x21\xd3\xa3\x21\x1f\x81\x1d\x18\xa9\xbd\x65\x74\x86\x4e\x63\x3d\x75\x18\x41\x4b\x20\x61\x48\x11\x91\x1d\x60\x3b\x06\xc8\xfa\xbc\x0c\x30\x66\x79\x96\x43\xfb\xdb\xc4\xe8\x27\xe3\xf1\x6e\xb7\x1b\x61\x4b\x77\x24\x5a\x8d\x8f\xd3\x8d\x3f\xcd\x3e\xdc\xce\x97\xb7\xc3\x96\x72\x96\xc3\x67\x67\x29\x04\x50\xfa\xb3\x61\xa5\x12\x8a\x3d\xa0\xf7\x96\x0d\x16\x96\xc0\xe2\x2e\x19\xd7\xba\xd3\x9a\xce\x0e\x76\xca\x91\x5d\x75\x03\xa1\x73\x3d\xcb\x2f\xdc\x39\xc9\x75\xa4\xc7\xe1\xa2\x40\x1c\xa0\x83\xc1\x74\x09\xb3\xe5\x00\x7e\x9e\x2e\x67\xcb\x9b\x2c\x87\x2f\xb3\xd5\xaf\x8b\xcf\x2b\xf8\x32\xbd\xbf\x9f\xce\x57\xb3\xdb\x25\x2c\xee\xe1\xc3\x62\xfe\x71\xb6\x9a\x2d\xe6\x4b\x58\xdc\xc1\x74\xfe\x15\x7e\x9b\xcd\x3f\xde\x00\x71\xdc\x90\x02\x3d\x7a\x4d\xfc\x45\x81\x93\x90\x54\x26\x4f\x8f\x01\x3a\x12\x48\xf9\x48\xcf\xc1\x93\xe1\x35\x1b\xb0\xe8\xaa\x06\x2b\x82\x4a\x1e\x48\x5d\x8a\x87\x27\xad\x39\x24\x3b\x03\xa0\x2b\xb3\x1c\x2c\xd7\x1c\xdb\x14\x85\xfe\x50\xa9\xcd\xf7\xbc\x5b\xd9\x96\x5d\x39\x81\x7b\xb1\x94\xa1\xe7\x2e\x59\x13\xd0\x02\xcd\x08\x9b\xb8\x11\xe5\xbf\x5a\x32\xa3\xed\x8f\x61\xc4\x32\x7e\xf8\x7f\x56\x53\xc4\x12\x23\x4e\x32\x00\x87\x35\x4d\xc0\x60\x4d\x76\xb8\x1d\x8a\x27\xc5\x28\x9a\x01\x58\x2c\xc8\x86\x54\x02\xc9\xda\x09\x0c\xba\xa2\x41\xa6\x8d\xa5\x30\xc9\x86\x80\x9e\x7f\x51\x69\x7c\x5b\x36\x3c\xa0\x9c\xc5\x27\x03\x50\x0a\xd2\xa8\xa1\xae\xa2\x68\xd8\x96\xe1\x54\x6c\x30\xa2\x95\xea\xb0\xc3\x2e\x52\xa5\x2d\xd9\x2d\xc7\xde\x9e\xb7\x18\xd3\x05\xed\x1d\x1c\x36\xb6\x09\x8f\x62\xc1\x2e\x5d\xdb\x8b\xbd\xf4\xf0\x40\x5a\x1c\x69\x2a\x61\xa4\x76\x59\x51\x6c\xff\x5a\x0e\x87\x85\xc7\x68\x36\xed\xaa\xf1\xe5\xb1\x6a\xd7\x6e\x7e\xcb\xb8\x67\xdd\xcb\xc4\x88\xfe\x3d\xda\x38\x44\x8c\xcd\x0b\x1a\x9e\x1f\x3c\x93\xf2\xca\xd1\x93\xa2\x57\xce\xc3\x38\x18\xb4\xf4\xc2\xf6\xa9\xfc\x99\xec\xaf\x1e\x3d\x81\x1d\x7d\x39\x55\x9f\x09\x74\xf4\xa4\x67\x45\x4f\xb2\xc1\xa0\x2f\x92\x97\x2e\x5f\x81\xf4\x81\x0d\x1d\x1e\xc8\x95\x5e\xd8\x75\xa1\xf2\xe9\x96\x84\x48\x2e\x3e\x88\x6d\x6a\x32\x16\xb9\x8b\x95\x11\xb7\xe6\xaa\x46\x7f\x04\x31\x4a\xf1\x02\x10\x8d\x91\xc6\xbd\x92\xa9\xce\xe0\xd3\xd2\x88\xb5\x64\x92\x72\xdf\x9e\xb9\x6b\x23\x8f\xe9\x91\xcc\x8b\x94\xfe\x39\x84\x57\x79\xdc\xf7\xbd\xe8\x01\x78\xb1\x6c\xf6\x2f\x82\x94\x1c\xb4\xf1\x69\xd4\xa2\x29\xab\xd7\x6e\xde\x99\x4a\x47\x41\xce\xa6\x7f\x41\x9b\x2b\x82\x5c\x7d\xd1\xf5\xf9\xa9\xd8\x2e\x0e\x69\x75\xf1\xa2\x30\xb6\x09\x91\xf4\xd9\xfe\x1b\xf8\x8b\xbe\x4d\xde\x33\xe6\x25\x79\x2b\xfb\xf6\x3b\xe7\x6d\x68\x15\x5d\xed\x33\x5e\x46\xc5\xfd\x21\xc5\x7f\x8b\x54\x9f\x50\xaf\xcb\x15\x40\x47\x31\x7d\x17\xb2\xab\xae\x66\x88\x5d\x95\x3e\x1c\xe8\x8d\x46\x0e\x51\x14\x2b\xba\x4a\xaf\x3b\x37\x16\xfb\x1c\x2f\x1a\xff\x1d\x00\x00\xff\xff\x55\x0d\x1a\x4b\xe2\x0b\x00\x00"),
 		},
 		"/rbac/patch-role-to-clusterrole.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "patch-role-to-clusterrole.yaml",