diff --git a/com.visualstudio.code.json b/com.visualstudio.code.json
index 6b080c9..f367318 100644
--- a/com.visualstudio.code.json
+++ b/com.visualstudio.code.json
@@ -17,6 +17,7 @@
       "--filesystem=host",
       "--talk-name=org.freedesktop.Notifications",
       "--talk-name=org.freedesktop.secrets",
+      "--env=NPM_CONFIG_GLOBALCONFIG=/app/etc/npmrc",
       "--extra-data=code.deb:57b5f003d7dc13d3555e5b62d7e14a3e9cef7d759e5d2df2432a28d526f38db6:43469528::https://go.microsoft.com/fwlink/?LinkID=760868"
     ],
   "modules": [
@@ -97,7 +98,8 @@
         "build-commands": [
             "install apply_extra /app/bin",
             "install code.sh /app/bin/code",
-            "cp /usr/bin/ar /app/bin"
+            "cp /usr/bin/ar /app/bin",
+            "install -m644 npmrc /app/etc"            
         ],
         "cleanup": [
             "/share/lintian",
@@ -119,13 +121,17 @@
                     "desktop-file-edit --set-key=Exec --set-value='code %F' export/share/applications/com.visualstudio.code.desktop",
                     "desktop-file-edit --set-key=Icon --set-value='com.visualstudio.code' export/share/applications/com.visualstudio.code.desktop",                    
                     "mkdir -p export/share/appdata",
-                    "sed s/code.desktop/com.visualstudio.code.desktop/ share/appdata/code.appdata.xml > export/share/appdata/com.visualstudio.code.appdata.xml"        
+                    "sed -e s/code.desktop/com.visualstudio.code.desktop/ -e 's/Multiple, see /LicenseRef-proprietary=/' share/appdata/code.appdata.xml > export/share/appdata/com.visualstudio.code.appdata.xml"        
                 ]
             },
             {
                 "type": "script",
-                "commands": ["/app/extra/share/code/code"],
+                "commands": ["exec env PATH=\"$PATH:$XDG_DATA_HOME/node_modules/bin\" /app/extra/share/code/bin/code --extensions-dir=$XDG_DATA_HOME/vscode/extensions"],
                 "dest-filename": "code.sh"
+            },
+            {
+                "type": "file",
+                "path": "npmrc"
             }
         ]
     }
diff --git a/npmrc b/npmrc
new file mode 100644
index 0000000..fee9404
--- /dev/null
+++ b/npmrc
@@ -0,0 +1,6 @@
+; We want to be completely separate from the host modules
+; which means not touching $HOME
+userconfig=${XDG_CONFIG_HOME}/npmrc
+prefix=${XDG_DATA_HOME}/node_modules
+init-module=${XDG_CONFIG_HOME}/npm-init.js
+tmp=${XDG_CACHE_HOME}