diff --git a/library/includes/cron/jobs/demo_mode.php b/library/includes/cron/jobs/demo_mode.php
deleted file mode 100644
index ec02cc498..000000000
--- a/library/includes/cron/jobs/demo_mode.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * TorrentPier – Bull-powered BitTorrent tracker engine
- *
- * @copyright Copyright (c) 2005-2025 TorrentPier (https://torrentpier.com)
- * @link      https://github.com/torrentpier/torrentpier for the canonical source repository
- * @license   https://github.com/torrentpier/torrentpier/blob/master/LICENSE MIT License
- */
-
-if (!defined('BB_ROOT')) {
-    die(basename(__FILE__));
-}
-
-set_time_limit(600);
-
-global $cron_runtime_log;
-
-$dump_path = BB_ROOT . 'install/sql/mysql.sql';
-
-if (!IN_DEMO_MODE || !is_file($dump_path) || !is_readable($dump_path)) {
-    return;
-}
-
-// Clean cache & datastore
-$datastore->clean();
-foreach (config()->get('cache.engines') as $cache_name => $cache_val) {
-    CACHE($cache_name)->rm();
-}
-
-// Drop tables & Insert sql dump
-$temp_line = '';
-foreach (file($dump_path) as $line) {
-    if (str_starts_with($line, '--') || $line == '') {
-        continue;
-    }
-
-    $temp_line .= $line;
-    if (str_ends_with(trim($line), ';')) {
-        if (!DB()->query($temp_line)) {
-            $cron_runtime_log[] = date('Y-m-d H:i:s') . " -- Error performing query: " . $temp_line . " | " . DB()->sql_error()['message'];
-        }
-        $temp_line = '';
-    }
-}
diff --git a/migrations/20250619000001_initial_schema.php b/migrations/20250619000001_initial_schema.php
index cc41b3203..cd36bb326 100644
--- a/migrations/20250619000001_initial_schema.php
+++ b/migrations/20250619000001_initial_schema.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * TorrentPier Initial Schema Migration
- * Converts install/sql/mysql.sql to Phinx migration
+ * Creates essential database schema for fresh installations
  */
 
 use Phinx\Migration\AbstractMigration;
diff --git a/migrations/20250620001449_remove_demo_mode.php b/migrations/20250620001449_remove_demo_mode.php
new file mode 100644
index 000000000..d32f3e798
--- /dev/null
+++ b/migrations/20250620001449_remove_demo_mode.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class RemoveDemoMode extends AbstractMigration
+{
+    /**
+     * Migrate Up.
+     */
+    public function up(): void
+    {
+        // Delete the demo_mode.php cron job from bb_cron table
+        $this->table('bb_cron')
+            ->getAdapter()
+            ->execute("DELETE FROM bb_cron WHERE cron_script = 'demo_mode.php'");
+    }
+
+    /**
+     * Migrate Down.
+     */
+    public function down(): void
+    {
+        // Restore the demo_mode.php cron job to bb_cron table
+        $this->table('bb_cron')->insert([
+            'cron_active' => 1,
+            'cron_title' => 'Demo mode',
+            'cron_script' => 'demo_mode.php',
+            'schedule' => 'daily',
+            'run_day' => null,
+            'run_time' => '05:00:00',
+            'run_order' => 255,
+            'last_run' => '1900-01-01 00:00:00',
+            'next_run' => '1900-01-01 00:00:00',
+            'run_interval' => null,
+            'log_enabled' => 1,
+            'log_file' => 'demo_mode_cron',
+            'log_sql_queries' => 1,
+            'disable_board' => 1,
+            'run_counter' => 0
+        ])->save();
+    }
+}