diff --git a/internal/gitsources/github/github.go b/internal/gitsources/github/github.go
index 98e84f3..51a83b0 100644
--- a/internal/gitsources/github/github.go
+++ b/internal/gitsources/github/github.go
@@ -122,16 +122,31 @@ func New(opts Opts) (*Client, error) {
 	}
 	httpClient := &http.Client{Transport: &TokenTransport{token: opts.Token, rt: transport}}
 
+	isPublicGithub := false
+	// TODO(sgotti) improve detection of public github url (handle also trailing slash)
 	if opts.APIURL == GitHubAPIURL {
+		isPublicGithub = true
+	}
+
+	if isPublicGithub {
 		opts.WebURL = GitHubWebURL
+		if !strings.HasSuffix(opts.APIURL, "/") {
+			opts.APIURL += "/"
+		}
 	} else {
 		if opts.WebURL == "" {
 			opts.WebURL = opts.APIURL
 		}
+		if !strings.HasSuffix(opts.APIURL, "/") {
+			opts.APIURL += "/"
+		}
+		if !strings.HasSuffix(opts.APIURL, "/api/v3/") {
+			opts.APIURL += "api/v3/"
+		}
 	}
 
 	client := github.NewClient(httpClient)
-	client.BaseURL, _ = url.Parse(GitHubAPIURL + "/")
+	client.BaseURL, _ = url.Parse(opts.APIURL)
 
 	return &Client{
 		client:         client,