diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 79e1ac3d18..c1991e3a09 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -67,6 +67,10 @@ App::post('/v1/teams')
         ])));
 
         if (!$isPrivilegedUser && !$isAppUser) { // Don't add user on server mode
+            if (!\in_array('owner', $roles)) {
+                $roles[] = 'owner';
+            }
+
             $membershipId = $dbForProject->getId();
             $membership = new Document([
                 '$id' => $membershipId,
diff --git a/tests/e2e/Services/Teams/TeamsBase.php b/tests/e2e/Services/Teams/TeamsBase.php
index e626124058..6f3dd167e9 100644
--- a/tests/e2e/Services/Teams/TeamsBase.php
+++ b/tests/e2e/Services/Teams/TeamsBase.php
@@ -17,7 +17,8 @@ trait TeamsBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
             'teamId' => 'unique()',
-            'name' => 'Arsenal'
+            'name' => 'Arsenal',
+            'roles' => ['player'],
         ]);
 
         $this->assertEquals(201, $response1['headers']['status-code']);
diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php
index 08e2ddc8c8..ffb3843118 100644
--- a/tests/e2e/Services/Teams/TeamsBaseClient.php
+++ b/tests/e2e/Services/Teams/TeamsBaseClient.php
@@ -28,7 +28,8 @@ trait TeamsBaseClient
         $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
         $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
         $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
-        $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]);
+        $this->assertContains('owner', $response['body']['memberships'][0]['roles']);
+        $this->assertContains('player', $response['body']['memberships'][0]['roles']);
 
         $membershipId = $response['body']['memberships'][0]['$id'];
 
@@ -45,7 +46,8 @@ trait TeamsBaseClient
         $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
         $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
         $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
-        $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]);
+        $this->assertContains('owner', $response['body']['memberships'][0]['roles']);
+        $this->assertContains('player', $response['body']['memberships'][0]['roles']);
 
         $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
             'content-type' => 'application/json',
@@ -60,7 +62,8 @@ trait TeamsBaseClient
         $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
         $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
         $this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
-        $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]);
+        $this->assertContains('owner', $response['body']['memberships'][0]['roles']);
+        $this->assertContains('player', $response['body']['memberships'][0]['roles']);
 
         $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
             'content-type' => 'application/json',