diff --git a/database/sql/enterprise.go b/database/sql/enterprise.go
index 53be988d..7d20d2e8 100644
--- a/database/sql/enterprise.go
+++ b/database/sql/enterprise.go
@@ -102,7 +102,11 @@ func (s *sqlDatabase) GetEnterpriseByID(ctx context.Context, enterpriseID string
 
 func (s *sqlDatabase) ListEnterprises(_ context.Context) ([]params.Enterprise, error) {
 	var enterprises []Enterprise
-	q := s.conn.Preload("Credentials").Preload("Credentials.Endpoint").Find(&enterprises)
+	q := s.conn.
+		Preload("Credentials").
+		Preload("Credentials.Endpoint").
+		Preload("Endpoint").
+		Find(&enterprises)
 	if q.Error != nil {
 		return []params.Enterprise{}, errors.Wrap(q.Error, "fetching enterprises")
 	}
diff --git a/database/sql/organizations.go b/database/sql/organizations.go
index 2e76cb18..1192c843 100644
--- a/database/sql/organizations.go
+++ b/database/sql/organizations.go
@@ -93,7 +93,11 @@ func (s *sqlDatabase) GetOrganization(ctx context.Context, name string) (params.
 
 func (s *sqlDatabase) ListOrganizations(_ context.Context) ([]params.Organization, error) {
 	var orgs []Organization
-	q := s.conn.Preload("Credentials").Preload("Credentials.Endpoint").Find(&orgs)
+	q := s.conn.
+		Preload("Credentials").
+		Preload("Credentials.Endpoint").
+		Preload("Endpoint").
+		Find(&orgs)
 	if q.Error != nil {
 		return []params.Organization{}, errors.Wrap(q.Error, "fetching org from database")
 	}
diff --git a/database/sql/repositories.go b/database/sql/repositories.go
index a938dd80..8e16b97f 100644
--- a/database/sql/repositories.go
+++ b/database/sql/repositories.go
@@ -92,7 +92,11 @@ func (s *sqlDatabase) GetRepository(ctx context.Context, owner, name string) (pa
 
 func (s *sqlDatabase) ListRepositories(_ context.Context) ([]params.Repository, error) {
 	var repos []Repository
-	q := s.conn.Preload("Credentials").Preload("Credentials.Endpoint").Find(&repos)
+	q := s.conn.
+		Preload("Credentials").
+		Preload("Credentials.Endpoint").
+		Preload("Endpoint").
+		Find(&repos)
 	if q.Error != nil {
 		return []params.Repository{}, errors.Wrap(q.Error, "fetching user from database")
 	}
diff --git a/runner/runner.go b/runner/runner.go
index bc2c3676..bc28a6c3 100644
--- a/runner/runner.go
+++ b/runner/runner.go
@@ -399,19 +399,13 @@ func (r *Runner) ListCredentials(ctx context.Context) ([]params.GithubCredential
 	if !auth.IsAdmin(ctx) {
 		return nil, runnerErrors.ErrUnauthorized
 	}
-	ret := []params.GithubCredentials{}
 
-	for _, val := range r.config.Github {
-		ret = append(ret, params.GithubCredentials{
-			Name:          val.Name,
-			Description:   val.Description,
-			BaseURL:       val.BaseEndpoint(),
-			APIBaseURL:    val.APIEndpoint(),
-			UploadBaseURL: val.UploadEndpoint(),
-			AuthType:      params.GithubAuthType(val.AuthType),
-		})
+	creds, err := r.store.ListGithubCredentials(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "fetching github credentials")
 	}
-	return ret, nil
+
+	return creds, nil
 }
 
 func (r *Runner) ListProviders(ctx context.Context) ([]params.Provider, error) {