diff --git a/UPGRADE.md b/UPGRADE.md
index 815dc2dd..fa6c3c7f 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -20,6 +20,10 @@
   * `tag:create`: Creating orphan tags makes no sense.
 * Params in camelCase format are no longer supported. They all have an equivalent kebab-case replacement. (for example, from `--startDate` to `--start-date`).
 * The `short-url:create` command no longer accepts the `--no-validate-url` flag. Now URLs are never validated, unless `--validate-url` is passed.
+* The CLI installer tool entry-points have changed.
+  * `bin/install`: replaced by `vendor/bin/shlink-installer install`
+  * `bin/update`: replaced by `vendor/bin/shlink-installer update`
+  * `bin/set-option`: replaced by `vendor/bin/shlink-installer set-option`
 
 ### Changes in config
 
@@ -31,6 +35,8 @@
   * `SHORT_DOMAIN_SCHEMA`: Replaced by `IS_HTTPS_ENABLED`.
   * `USE_HTTPS`: Replaced by `IS_HTTPS_ENABLED`.
   * `VALIDATE_URLS`: There's no replacement. URLs are not validated, unless explicitly requested during creation or edition.
+* The next env vars behavior has changed:
+  * `DELETE_SHORT_URL_THRESHOLD`: Now, if this env var is not provided, the "visits threshold" won't be checked at all when deleting short URLs. Make sure you explicitly provide a value if you want to enable this feature.
 
 ### Other changes
 
diff --git a/bin/install b/bin/install
deleted file mode 100755
index d20db86d..00000000
--- a/bin/install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[$install] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$install();
diff --git a/bin/set-option b/bin/set-option
deleted file mode 100755
index ff727f30..00000000
--- a/bin/set-option
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use Shlinkio\Shlink\Installer\Command\SetOptionCommand;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[,, $installer] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$installer(SetOptionCommand::NAME);
diff --git a/bin/update b/bin/update
deleted file mode 100755
index ad20ce46..00000000
--- a/bin/update
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[, $update] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$update();
diff --git a/config/autoload/delete_short_urls.global.php b/config/autoload/delete_short_urls.global.php
index 7f64abd7..49a3e944 100644
--- a/config/autoload/delete_short_urls.global.php
+++ b/config/autoload/delete_short_urls.global.php
@@ -6,13 +6,15 @@ namespace Shlinkio\Shlink;
 
 use function Shlinkio\Shlink\Common\env;
 
-use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
+return (static function (): array {
+    $threshold = env('DELETE_SHORT_URL_THRESHOLD');
 
-return [
+    return [
 
-    'delete_short_urls' => [
-        'check_visits_threshold' => true,
-        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
-    ],
+        'delete_short_urls' => [
+            'check_visits_threshold' => $threshold !== null,
+            'visits_threshold' => (int) ($threshold ?? DEFAULT_DELETE_SHORT_URL_THRESHOLD),
+        ],
 
-];
+    ];
+})();