diff --git a/package-lock.json b/package-lock.json
index 1bf9c68f1679..43034ccad961 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "bit-bin",
-  "version": "13.0.0-dev.8",
+  "version": "13.0.0-dev.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -193,6 +193,19 @@
         "samsam": "1.3.0"
       }
     },
+    "@teambit/gitconfig": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@teambit/gitconfig/-/gitconfig-2.0.5.tgz",
+      "integrity": "sha512-EUUrOHVI9rOT/wua4woWq3TqwiCxxrhhV0Z7PE4MeVVDIIt4h6shMSdMRijNmEBvdHvpQdOSkkvaaxmm030QSg==",
+      "requires": {
+        "argx": "^3.0.0",
+        "arrayreduce": "^2.1.0",
+        "askconfig": "^3.0.5",
+        "co": "^4.6.0",
+        "execcli": "^4.0.8",
+        "objnest": "^3.0.6"
+      }
+    },
     "abab": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
@@ -1652,9 +1665,9 @@
       "integrity": "sha512-XBaoWE9RW8pPdPQNibZsW2zh8TW6gcarXp1FZPwT8Uop8ScSNldJEWf2k9l3HeTqdrEwsOsFcq74RiJECW34yA=="
     },
     "bit-javascript": {
-      "version": "0.10.17-dev.7",
-      "resolved": "https://registry.npmjs.org/bit-javascript/-/bit-javascript-0.10.17-dev.7.tgz",
-      "integrity": "sha512-Y1GUA5kohgjymBR4if5sLDXkxlTl7YZkw2XMGPqdLWKqzKSVxIT2UHq97T0/FG+OWzEH71lGw9OyqHbpHSlquQ==",
+      "version": "0.10.17-dev.9",
+      "resolved": "https://registry.npmjs.org/bit-javascript/-/bit-javascript-0.10.17-dev.9.tgz",
+      "integrity": "sha512-D0KgCU0Cpdzo1TnnnEhIzKYx9xsNoQqpaVwef/2k0Xto0yhZ8qWRWBMpigNBGmLUXvP34ntaJXGGWbnUUn96bQ==",
       "requires": {
         "app-module-path": "^2.2.0",
         "camelcase": "^4.0.0",
@@ -1663,7 +1676,6 @@
         "commander": "^2.14.1",
         "debug": "^3.1.0",
         "detective-amd": "^2.4.0",
-        "detective-cjs": "^2.0.0",
         "detective-less": "^1.0.1",
         "detective-sass": "^2.0.1",
         "detective-scss": "^1.0.1",
@@ -1673,7 +1685,6 @@
         "glob": "^7.1.1",
         "ini-builder": "^1.1.1",
         "is-relative-path": "^2.0.0",
-        "lodash.flatten": "^4.4.0",
         "lodash.partition": "^4.6.0",
         "lodash.set": "^4.3.2",
         "module-definition": "^2.2.4",
@@ -2731,15 +2742,6 @@
         "node-source-walk": "^3.0.0"
       }
     },
-    "detective-cjs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-2.0.0.tgz",
-      "integrity": "sha1-3OTJMCzcpS5ri/04d8qT9ixczAM=",
-      "requires": {
-        "ast-module-types": "^2.3.2",
-        "node-source-walk": "^3.0.0"
-      }
-    },
     "detective-less": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.1.tgz",
@@ -3989,9 +3991,9 @@
       "dev": true
     },
     "fs-extra": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-      "integrity": "sha1-QU0BEM3QZwVzTQVWUsVBEmDDGr0=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "jsonfile": "^4.0.0",
@@ -4553,18 +4555,6 @@
         }
       }
     },
-    "gitconfig": {
-      "version": "github:teambit/node-gitconfig#80292a3a2b837b27fffefaff71fe1fa13ecca6ea",
-      "from": "github:teambit/node-gitconfig",
-      "requires": {
-        "argx": "^3.0.0",
-        "arrayreduce": "^2.1.0",
-        "askconfig": "^3.0.5",
-        "co": "^4.6.0",
-        "execcli": "^4.0.8",
-        "objnest": "^3.0.6"
-      }
-    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -6242,11 +6232,6 @@
       "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
       "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw="
     },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
-    },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -8644,6 +8629,16 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
           "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+        },
+        "fs-extra": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index eb05730a9ff3..91b06e1a46a2 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "execa": "^0.8.0",
     "find-up": "^2.1.0",
     "fs-extra": "^6.0.0",
-    "gitconfig": "teambit/node-gitconfig",
+    "@teambit/gitconfig": "^2.0.5",
     "glob": "^7.1.1",
     "graphlib": "^2.1.5",
     "group-array": "^0.3.3",
diff --git a/src/api/consumer/lib/global-config.js b/src/api/consumer/lib/global-config.js
index 5737f0650f13..66edb2a1dbaf 100644
--- a/src/api/consumer/lib/global-config.js
+++ b/src/api/consumer/lib/global-config.js
@@ -1,5 +1,5 @@
 /** @flow */
-import gitconfig from 'gitconfig';
+import gitconfig from '@teambit/gitconfig';
 import R from 'ramda';
 import { GlobalConfig } from '../../../global-config';
 import Config from '../../../global-config/config';