diff --git a/packages/aragon-cli/package.json b/packages/aragon-cli/package.json
index 82701ea3a..b8ed32fe3 100644
--- a/packages/aragon-cli/package.json
+++ b/packages/aragon-cli/package.json
@@ -42,7 +42,7 @@
   "dependencies": {
     "@aragon/apm": "^3.1.0",
     "@aragon/apps-shared-minime": "^1.0.1",
-    "@aragon/aragen": "^4.0.0",
+    "@aragon/aragen": "^4.1.0",
     "@aragon/os": "^4.0.0",
     "@aragon/wrapper": "^5.0.0-rc.3",
     "@babel/polyfill": "^7.0.0",
@@ -132,7 +132,8 @@
   "aragon": {
     "clientVersion": "e08deb62080e17fe652fa83f60dc81a02c455c41",
     "clientPort": "3000",
-    "defaultGasPrice": "10000000000"
+    "defaultGasPrice": "10000000000",
+    "defaultIpfsTimeout": "300000"
   },
   "husky": {
     "hooks": {
diff --git a/packages/aragon-cli/src/commands/dao.js b/packages/aragon-cli/src/commands/dao.js
index 90e87505c..a642a7472 100644
--- a/packages/aragon-cli/src/commands/dao.js
+++ b/packages/aragon-cli/src/commands/dao.js
@@ -5,7 +5,11 @@ exports.command = 'dao <command>'
 exports.describe = 'Manage your Aragon DAO'
 
 exports.builder = function(yargs) {
-  if (process.argv[3] !== 'new' && process.argv[3] !== 'act') {
+  if (
+    process.argv[3] !== 'new' &&
+    process.argv[3] !== 'act' &&
+    process.argv[3] !== 'token'
+  ) {
     yargs = daoArg(yargs)
   }
   return yargs
diff --git a/packages/aragon-cli/src/commands/dao_cmds/utils/getRepoTask.js b/packages/aragon-cli/src/commands/dao_cmds/utils/getRepoTask.js
index c7a481209..da695c854 100644
--- a/packages/aragon-cli/src/commands/dao_cmds/utils/getRepoTask.js
+++ b/packages/aragon-cli/src/commands/dao_cmds/utils/getRepoTask.js
@@ -1,4 +1,6 @@
+const pkg = require('../../../../package.json')
 const LATEST_VERSION = 'latest'
+const DEFAULT_IPFS_TIMEOUT = pkg.aragon.defaultIpfsTimeout
 
 module.exports = {
   args: yargs => {
@@ -19,9 +21,13 @@ module.exports = {
   }) => {
     return async ctx => {
       if (apmRepoVersion === LATEST_VERSION) {
-        ctx.repo = await apm.getLatestVersion(apmRepo)
+        ctx.repo = await apm.getLatestVersion(apmRepo, DEFAULT_IPFS_TIMEOUT)
       } else {
-        ctx.repo = await apm.getVersion(apmRepo, apmRepoVersion.split('.'))
+        ctx.repo = await apm.getVersion(
+          apmRepo,
+          apmRepoVersion.split('.'),
+          DEFAULT_IPFS_TIMEOUT
+        )
       }
 
       // appId is loaded from artifact.json in IPFS