diff --git a/models/repo/repo_test.go b/models/repo/repo_test.go
index ce17789a3b..5385c22ded 100644
--- a/models/repo/repo_test.go
+++ b/models/repo/repo_test.go
@@ -182,30 +182,30 @@ func TestComposeSSHCloneURL(t *testing.T) {
 	setting.SSH.Domain = "domain"
 	setting.SSH.Port = 22
 	setting.Repository.UseCompatSSHURI = false
-	assert.Equal(t, "git@domain:user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo"))
+	assert.Equal(t, "git@domain:user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo", 0))
 	setting.Repository.UseCompatSSHURI = true
-	assert.Equal(t, "ssh://git@domain/user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo"))
+	assert.Equal(t, "ssh://git@domain/user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo", 0))
 	// test SSH_DOMAIN while use non-standard SSH port
 	setting.SSH.Port = 123
 	setting.Repository.UseCompatSSHURI = false
-	assert.Equal(t, "ssh://git@domain:123/user/repo.git", ComposeSSHCloneURL(nil, "user", "repo"))
+	assert.Equal(t, "ssh://git@domain:123/user/repo.git", ComposeSSHCloneURL(nil, "user", "repo", 0))
 	setting.Repository.UseCompatSSHURI = true
-	assert.Equal(t, "ssh://git@domain:123/user/repo.git", ComposeSSHCloneURL(nil, "user", "repo"))
+	assert.Equal(t, "ssh://git@domain:123/user/repo.git", ComposeSSHCloneURL(nil, "user", "repo", 0))
 
 	// test IPv6 SSH_DOMAIN
 	setting.Repository.UseCompatSSHURI = false
 	setting.SSH.Domain = "::1"
 	setting.SSH.Port = 22
-	assert.Equal(t, "git@[::1]:user/repo.git", ComposeSSHCloneURL(nil, "user", "repo"))
+	assert.Equal(t, "git@[::1]:user/repo.git", ComposeSSHCloneURL(nil, "user", "repo", 0))
 	setting.SSH.Port = 123
-	assert.Equal(t, "ssh://git@[::1]:123/user/repo.git", ComposeSSHCloneURL(nil, "user", "repo"))
+	assert.Equal(t, "ssh://git@[::1]:123/user/repo.git", ComposeSSHCloneURL(nil, "user", "repo", 0))
 
 	setting.SSH.User = "(DOER_USERNAME)"
 	setting.SSH.Domain = "domain"
 	setting.SSH.Port = 22
-	assert.Equal(t, "doer@domain:user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo"))
+	assert.Equal(t, "doer@domain:user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo", 0))
 	setting.SSH.Port = 123
-	assert.Equal(t, "ssh://doer@domain:123/user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo"))
+	assert.Equal(t, "ssh://doer@domain:123/user/repo.git", ComposeSSHCloneURL(&user_model.User{Name: "doer"}, "user", "repo", 0))
 }
 
 func TestIsUsableRepoName(t *testing.T) {
diff --git a/models/repo/wiki_test.go b/models/repo/wiki_test.go
index 636c78009b..3bbb0d06e3 100644
--- a/models/repo/wiki_test.go
+++ b/models/repo/wiki_test.go
@@ -25,6 +25,6 @@ func TestRepository_RelativeWikiPath(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-	assert.Equal(t, "user2/repo1.wiki.git", repo_model.RelativeWikiPath(repo.OwnerName, repo.Name))
+	assert.Equal(t, "user2/repo1.wiki.git", repo_model.RelativeWikiPath(repo.OwnerName, repo.Name, repo.GroupID))
 	assert.Equal(t, "user2/repo1.wiki.git", repo.WikiStorageRepo().RelativePath())
 }
diff --git a/services/repository/adopt_test.go b/services/repository/adopt_test.go
index a7de918085..b17ad59176 100644
--- a/services/repository/adopt_test.go
+++ b/services/repository/adopt_test.go
@@ -119,7 +119,7 @@ func TestAdoptRepository(t *testing.T) {
 
 	unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: "test-adopt"})
 
-	exist, err := util.IsExist(repo_model.RepoPath(user2.Name, "test-adopt"))
+	exist, err := util.IsExist(repo_model.RepoPath(user2.Name, "test-adopt", 0))
 	assert.NoError(t, err)
 	assert.True(t, exist) // the repository should be still in the disk
 }
diff --git a/services/repository/create_test.go b/services/repository/create_test.go
index b8c2ea59dd..9786b87763 100644
--- a/services/repository/create_test.go
+++ b/services/repository/create_test.go
@@ -27,7 +27,7 @@ func TestCreateRepositoryDirectly(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, createdRepo)
 
-	exist, err := util.IsExist(repo_model.RepoPath(user2.Name, createdRepo.Name))
+	exist, err := util.IsExist(repo_model.RepoPath(user2.Name, createdRepo.Name, createdRepo.GroupID))
 	assert.NoError(t, err)
 	assert.True(t, exist)
 
@@ -38,7 +38,7 @@ func TestCreateRepositoryDirectly(t *testing.T) {
 
 	// a failed creating because some mock data
 	// create the repository directory so that the creation will fail after database record created.
-	assert.NoError(t, os.MkdirAll(repo_model.RepoPath(user2.Name, createdRepo.Name), os.ModePerm))
+	assert.NoError(t, os.MkdirAll(repo_model.RepoPath(user2.Name, createdRepo.Name, createdRepo.GroupID), os.ModePerm))
 
 	createdRepo2, err := CreateRepositoryDirectly(t.Context(), user2, user2, CreateRepoOptions{
 		Name: "created-repo",
@@ -49,7 +49,7 @@ func TestCreateRepositoryDirectly(t *testing.T) {
 	// assert the cleanup is successful
 	unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: createdRepo.Name})
 
-	exist, err = util.IsExist(repo_model.RepoPath(user2.Name, createdRepo.Name))
+	exist, err = util.IsExist(repo_model.RepoPath(user2.Name, createdRepo.Name, createdRepo.GroupID))
 	assert.NoError(t, err)
 	assert.False(t, exist)
 }
diff --git a/services/repository/fork_test.go b/services/repository/fork_test.go
index 680a7f3207..faf14b0c5a 100644
--- a/services/repository/fork_test.go
+++ b/services/repository/fork_test.go
@@ -63,7 +63,7 @@ func TestForkRepositoryCleanup(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, fork)
 
-	exist, err := util.IsExist(repo_model.RepoPath(user2.Name, "test"))
+	exist, err := util.IsExist(repo_model.RepoPath(user2.Name, "test", 0))
 	assert.NoError(t, err)
 	assert.True(t, exist)
 
@@ -72,7 +72,7 @@ func TestForkRepositoryCleanup(t *testing.T) {
 
 	// a failed creating because some mock data
 	// create the repository directory so that the creation will fail after database record created.
-	assert.NoError(t, os.MkdirAll(repo_model.RepoPath(user2.Name, "test"), os.ModePerm))
+	assert.NoError(t, os.MkdirAll(repo_model.RepoPath(user2.Name, "test", 0), os.ModePerm))
 
 	fork2, err := ForkRepository(t.Context(), user2, user2, ForkRepoOptions{
 		BaseRepo: repo10,
@@ -84,7 +84,7 @@ func TestForkRepositoryCleanup(t *testing.T) {
 	// assert the cleanup is successful
 	unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: "test"})
 
-	exist, err = util.IsExist(repo_model.RepoPath(user2.Name, "test"))
+	exist, err = util.IsExist(repo_model.RepoPath(user2.Name, "test", 0))
 	assert.NoError(t, err)
 	assert.False(t, exist)
 }
diff --git a/services/repository/transfer_test.go b/services/repository/transfer_test.go
index 8d73fef7f4..772b48515f 100644
--- a/services/repository/transfer_test.go
+++ b/services/repository/transfer_test.go
@@ -47,10 +47,10 @@ func TestTransferOwnership(t *testing.T) {
 	assert.EqualValues(t, 1, transferredRepo.OwnerID) // repo_transfer.yml id=1
 	unittest.AssertNotExistsBean(t, &repo_model.RepoTransfer{ID: 1})
 
-	exist, err := util.IsExist(repo_model.RepoPath("org3", "repo3"))
+	exist, err := util.IsExist(repo_model.RepoPath("org3", "repo3", 0))
 	assert.NoError(t, err)
 	assert.False(t, exist)
-	exist, err = util.IsExist(repo_model.RepoPath("user1", "repo3"))
+	exist, err = util.IsExist(repo_model.RepoPath("user1", "repo3", 0))
 	assert.NoError(t, err)
 	assert.True(t, exist)
 	unittest.AssertExistsAndLoadBean(t, &activities_model.Action{