diff --git a/db/migrate/00_create_active_storage_tables.active_storage.rb b/db/migrate/00_create_active_storage_tables.active_storage.rb
index 360e0d1b..91c2a6d7 100644
--- a/db/migrate/00_create_active_storage_tables.active_storage.rb
+++ b/db/migrate/00_create_active_storage_tables.active_storage.rb
@@ -1,18 +1,22 @@
-# This migration comes from active_storage (originally 20170806125915)
-class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+class CreateActiveStorageTables < ActiveRecord::Migration[6.0]
   def change
     create_table :active_storage_blobs do |t|
       t.string   :key,        null: false
       t.string   :filename,   null: false
       t.string   :content_type
+      t.string   :service_name, null: false
       t.text     :metadata
       t.bigint   :byte_size,  null: false
-      t.string   :checksum,   null: false
+      t.string   :checksum,   null: true
       t.datetime :created_at, null: false
 
       t.index [ :key ], unique: true
     end
 
+    if configured_service = ActiveStorage::Blob.service.name
+      ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+    end
+
     create_table :active_storage_attachments do |t|
       t.string     :name,     null: false
       t.references :record,   null: false, polymorphic: true, index: false
@@ -22,5 +26,25 @@ def change
 
       t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
     end
+
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
+      t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
   end
+
+  private
+    def primary_key_type
+      config = Rails.configuration.generators
+      config.options[config.orm][:primary_key_type] || :primary_key
+    end
+
+    def blobs_primary_key_type
+      pkey_name = connection.primary_key(:active_storage_blobs)
+      pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
+      pkey_column.bigint? ? :bigint : pkey_column.type
+    end
 end
diff --git a/db/migrate/01_create_cms.rb b/db/migrate/01_create_cms.rb
index 8369f9ca..6b7ad921 100644
--- a/db/migrate/01_create_cms.rb
+++ b/db/migrate/01_create_cms.rb
@@ -88,6 +88,7 @@ def change
       t.integer :site_id,     null: false
       t.string  :label,       null: false
       t.string  :identifier,  null: false
+      t.boolean :markdown
       t.text    :content,     limit: LIMIT
       t.integer :position,    null: false, default: 0
       t.timestamps
diff --git a/db/migrate/20241107190852_update_active_storage.rb b/db/migrate/20241107190852_update_active_storage.rb
deleted file mode 100644
index eda4a9df..00000000
--- a/db/migrate/20241107190852_update_active_storage.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class UpdateActiveStorage < ActiveRecord::Migration[6.1]
-  def change
-    add_column :active_storage_blobs, :service_name, :string, null: false
-    change_column :active_storage_blobs, :checksum, :string, null: true
-
-    if configured_service = ActiveStorage::Blob.service.name
-      ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
-    end
-
-    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
-      t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
-      t.string :variation_digest, null: false
-
-      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
-      t.foreign_key :active_storage_blobs, column: :blob_id
-    end
-  end
-
-  private
-
-  def primary_key_type
-    config = Rails.configuration.generators
-    config.options[config.orm][:primary_key_type] || :primary_key
-  end
-
-  def blobs_primary_key_type
-    pkey_name = connection.primary_key(:active_storage_blobs)
-    pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
-    pkey_column.bigint? ? :bigint : pkey_column.type
-  end
-end
diff --git a/db/migrate/20241107192847_add_markdown_to_comfy_cms_snippets.rb b/db/migrate/20241107192847_add_markdown_to_comfy_cms_snippets.rb
deleted file mode 100644
index 3b4a2df5..00000000
--- a/db/migrate/20241107192847_add_markdown_to_comfy_cms_snippets.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddMarkdownToComfyCmsSnippets < ActiveRecord::Migration[6.1]
-  def change
-    add_column :comfy_cms_snippets, :markdown, :boolean, default: false
-  end
-end