diff --git a/pkg/operator/ceph/object/spec.go b/pkg/operator/ceph/object/spec.go
index 7fc6dd4fb4f47..e8b3ad0ca2eb3 100644
--- a/pkg/operator/ceph/object/spec.go
+++ b/pkg/operator/ceph/object/spec.go
@@ -111,7 +111,7 @@ func (c *clusterConfig) makeRGWPodSpec(rgwConfig *rgwConfig) (v1.PodTemplateSpec
 	if c.clusterSpec.LogCollector.Enabled {
 		shareProcessNamespace := true
 		podSpec.ShareProcessNamespace = &shareProcessNamespace
-		podSpec.Containers = append(podSpec.Containers, *controller.LogCollectorContainer(strings.TrimPrefix(generateCephXUser(fmt.Sprintf("ceph-client.%s", rgwConfig.ResourceName)), "client."), c.clusterInfo.Namespace, *c.clusterSpec))
+		podSpec.Containers = append(podSpec.Containers, *controller.LogCollectorContainer(getDaemonName(rgwConfig), c.clusterInfo.Namespace, *c.clusterSpec))
 	}
 
 	// Replace default unreachable node toleration
@@ -611,3 +611,7 @@ func (c *clusterConfig) rgwTLSSecretType(secretName string) (v1.SecretType, erro
 	}
 	return "", errors.Wrapf(err, "no Kubernetes secrets referring TLS certificates found")
 }
+
+func getDaemonName(rgwConfig *rgwConfig) string {
+	return fmt.Sprintf("ceph-%s", generateCephXUser(rgwConfig.ResourceName))
+}
diff --git a/pkg/operator/ceph/object/spec_test.go b/pkg/operator/ceph/object/spec_test.go
index d148ec4deadcf..0c7108bd6e81c 100644
--- a/pkg/operator/ceph/object/spec_test.go
+++ b/pkg/operator/ceph/object/spec_test.go
@@ -379,3 +379,30 @@ func TestCheckRGWKMS(t *testing.T) {
 	assert.True(t, b)
 	assert.NoError(t, err)
 }
+
+func TestGetDaemonName(t *testing.T) {
+	context := &clusterd.Context{Clientset: test.New(t, 3)}
+	store := simpleStore()
+	c := &clusterConfig{
+		context: context,
+		store:   store,
+	}
+	daemonName := fmt.Sprintf("%s-%s", c.store.Name, "a")
+	resourceName := fmt.Sprintf("%s-%s", AppName, daemonName)
+	rgwconfig := &rgwConfig{
+		ResourceName: resourceName,
+		DaemonID:     daemonName,
+	}
+	daemon := getDaemonName(rgwconfig)
+	assert.Equal(t, "ceph-client.rgw.default.a", daemon)
+
+	c.store.Name = "my-store" // updating store name
+	daemonName = fmt.Sprintf("%s-%s", c.store.Name, "b")
+	resourceName = fmt.Sprintf("%s-%s", AppName, daemonName)
+	rgwconfig = &rgwConfig{
+		ResourceName: resourceName,
+		DaemonID:     daemonName,
+	}
+	daemon = getDaemonName(rgwconfig)
+	assert.Equal(t, "ceph-client.rgw.my.store.b", daemon)
+}