diff --git a/scripts/commands/epg/grab.ts b/scripts/commands/epg/grab.ts
index b3323a86..cdaba5a1 100644
--- a/scripts/commands/epg/grab.ts
+++ b/scripts/commands/epg/grab.ts
@@ -1,32 +1,48 @@
 import { Logger, Timer, Storage, Collection } from '@freearhey/core'
-import { program } from 'commander'
+import { Option, program } from 'commander'
 import { QueueCreator, Job, ChannelsParser } from '../../core'
 import { Channel } from 'epg-grabber'
 import path from 'path'
 import { SITES_DIR } from '../../constants'
 
 program
-  .option('-s, --site <name>', 'Name of the site to parse')
-  .option(
-    '-c, --channels <path>',
-    'Path to *.channels.xml file (required if the "--site" attribute is not specified)'
+  .addOption(new Option('-s, --site <name>', 'Name of the site to parse'))
+  .addOption(
+    new Option(
+      '-c, --channels <path>',
+      'Path to *.channels.xml file (required if the "--site" attribute is not specified)'
+    )
   )
-  .option('-o, --output <path>', 'Path to output file', 'guide.xml')
-  .option('-l, --lang <code>', 'Filter channels by language (ISO 639-2 code)')
-  .option('-t, --timeout <milliseconds>', 'Override the default timeout for each request')
-  .option('-d, --delay <milliseconds>', 'Override the default delay between request')
-  .option(
-    '--days <days>',
-    'Override the number of days for which the program will be loaded (defaults to the value from the site config)',
-    value => parseInt(value)
+  .addOption(new Option('-o, --output <path>', 'Path to output file').default('guide.xml'))
+  .addOption(new Option('-l, --lang <code>', 'Filter channels by language (ISO 639-2 code)'))
+  .addOption(
+    new Option('-t, --timeout <milliseconds>', 'Override the default timeout for each request').env(
+      'TIMEOUT'
+    )
   )
-  .option(
-    '--maxConnections <number>',
-    'Limit on the number of concurrent requests',
-    value => parseInt(value),
-    1
+  .addOption(
+    new Option('-d, --delay <milliseconds>', 'Override the default delay between request').env(
+      'DELAY'
+    )
+  )
+  .addOption(
+    new Option(
+      '--days <days>',
+      'Override the number of days for which the program will be loaded (defaults to the value from the site config)'
+    )
+      .argParser(value => parseInt(value))
+      .env('DAYS')
+  )
+  .addOption(
+    new Option('--maxConnections <number>', 'Limit on the number of concurrent requests')
+      .default(1)
+      .env('MAX_CONNECTIONS')
+  )
+  .addOption(
+    new Option('--gzip', 'Create a compressed version of the guide as well')
+      .default(false)
+      .env('GZIP')
   )
-  .option('--gzip', 'Create a compressed version of the guide as well', false)
   .parse(process.argv)
 
 export type GrabOptions = {