diff --git a/dist/index.js b/dist/index.js
index 7358cc4..613d5e0 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -177,19 +177,19 @@ try {
     child_process.execSync('ssh-add -l', { stdio: 'inherit' });
 
     child_process.execFileSync('ssh-add', ['-L']).toString().split(/\r?\n/).forEach(function(key) {
-        let parts = key.match(/git@github.com:(.*)\.git/);
+        let parts = key.match(/\bgithub.com[:/](.*)(?:\.git)?\b/);
 
         if (parts == null) {
             return;
         }
 
-        let userHost = parts[1];
+        let ownerAndRepo = parts[1];
         let sha256 = crypto.createHash('sha256').update(key).digest('hex');
 
         fs.writeFileSync(`${homeSsh}/${sha256}`, key + "\n", { mode: '600' });
 
-        child_process.execSync(`git config --global --replace-all url."git@${sha256}:${userHost}".insteadOf "https://github.com/${userHost}"`);
-        child_process.execSync(`git config --global --add url."git@${sha256}:${userHost}".insteadOf "git@github.com:${userHost}"`);
+        child_process.execSync(`git config --global --replace-all url."git@${sha256}:${ownerAndRepo}".insteadOf "https://github.com/${ownerAndRepo}"`);
+        child_process.execSync(`git config --global --add url."git@${sha256}:${ownerAndRepo}".insteadOf "git@github.com:${ownerAndRepo}"`);
 
         let sshConfig = `\nHost ${sha256}\n`
                               + `    HostName github.com\n`
@@ -199,7 +199,7 @@ try {
 
         fs.appendFileSync(`${homeSsh}/config`, sshConfig);
 
-        console.log(`Added deploy-key mapping: Use key ${sha256} for GitHub repository ${userHost}`);
+        console.log(`Added deploy-key mapping: Use key ${sha256} for GitHub repository ${ownerAndRepo}`);
     });
 
 } catch (error) {
diff --git a/index.js b/index.js
index a459067..f84e2c4 100644
--- a/index.js
+++ b/index.js
@@ -60,19 +60,19 @@ try {
     child_process.execSync('ssh-add -l', { stdio: 'inherit' });
 
     child_process.execFileSync('ssh-add', ['-L']).toString().split(/\r?\n/).forEach(function(key) {
-        let parts = key.match(/git@github.com:(.*)\.git/);
+        let parts = key.match(/\bgithub.com[:/](.*)(?:\.git)?\b/);
 
         if (parts == null) {
             return;
         }
 
-        let userHost = parts[1];
+        let ownerAndRepo = parts[1];
         let sha256 = crypto.createHash('sha256').update(key).digest('hex');
 
         fs.writeFileSync(`${homeSsh}/${sha256}`, key + "\n", { mode: '600' });
 
-        child_process.execSync(`git config --global --replace-all url."git@${sha256}:${userHost}".insteadOf "https://github.com/${userHost}"`);
-        child_process.execSync(`git config --global --add url."git@${sha256}:${userHost}".insteadOf "git@github.com:${userHost}"`);
+        child_process.execSync(`git config --global --replace-all url."git@${sha256}:${ownerAndRepo}".insteadOf "https://github.com/${ownerAndRepo}"`);
+        child_process.execSync(`git config --global --add url."git@${sha256}:${ownerAndRepo}".insteadOf "git@github.com:${ownerAndRepo}"`);
 
         let sshConfig = `\nHost ${sha256}\n`
                               + `    HostName github.com\n`
@@ -82,7 +82,7 @@ try {
 
         fs.appendFileSync(`${homeSsh}/config`, sshConfig);
 
-        console.log(`Added deploy-key mapping: Use key ${sha256} for GitHub repository ${userHost}`);
+        console.log(`Added deploy-key mapping: Use key ${sha256} for GitHub repository ${ownerAndRepo}`);
     });
 
 } catch (error) {