diff --git a/app/models/assigned_server_role.rb b/app/models/assigned_server_role.rb
index c1ac6442894..4155bed5dd4 100644
--- a/app/models/assigned_server_role.rb
+++ b/app/models/assigned_server_role.rb
@@ -2,7 +2,7 @@ class AssignedServerRole < ApplicationRecord
   belongs_to :miq_server
   belongs_to :server_role
 
-  attribute :active, :default => false
+  default_value_for :active, false
 
   delegate :master_supported?, :name, :to => :server_role
 
diff --git a/app/models/blacklisted_event.rb b/app/models/blacklisted_event.rb
index c48ceb0fe0b..4ead1e0717e 100644
--- a/app/models/blacklisted_event.rb
+++ b/app/models/blacklisted_event.rb
@@ -1,11 +1,10 @@
 class BlacklistedEvent < ApplicationRecord
   belongs_to        :ext_management_system, :foreign_key => "ems_id"
 
-  attribute :enabled, :default => true
-  after_validation  :log_enabling, :if => :enabled_changed?, :unless => :new_record?
-  after_create      :audit_creation
-  after_destroy     :reload_all_server_settings, :audit_deletion
+  default_value_for :enabled, true
   after_save        :reload_all_server_settings
+  after_destroy     :reload_all_server_settings, :audit_deletion
+  after_create      :audit_creation
 
   def audit_deletion
     $audit_log.info("Blacklisted event [#{event_name}] for provider [#{provider_model}] with ID [#{ems_id}] has been deleted by user [#{self.class.current_userid}]")
@@ -15,8 +14,11 @@ def audit_creation
     $audit_log.info("Creating blacklisted event [#{event_name}] for provider [#{provider_model}] with ID [#{ems_id}] by user [#{self.class.current_userid}]")
   end
 
-  def log_enabling
-    $audit_log.info("Blacklisted event [#{event_name}] for provider [#{provider_model}] with ID [#{ems_id}] had enabled changed to #{enabled} by user [#{self.class.current_userid}]")
+  def enabled=(value)
+    return if enabled == value
+
+    super
+    $audit_log.info("Blacklisted event [#{event_name}] for provider [#{provider_model}] with ID [#{ems_id}] had enabled changed to #{value} by user [#{self.class.current_userid}]")
   end
 
   def self.seed
diff --git a/app/models/classification.rb b/app/models/classification.rb
index 6014b727d50..35ccf2b4fb4 100644
--- a/app/models/classification.rb
+++ b/app/models/classification.rb
@@ -35,10 +35,10 @@ class Classification < ApplicationRecord
 
   DEFAULT_NAMESPACE = "/managed".freeze
 
-  attribute :read_only,    :default => false
-  attribute :syntax,       :default => "string"
-  attribute :single_value, :default => false
-  attribute :show,         :default => true
+  default_value_for :read_only,    false
+  default_value_for :syntax,       "string"
+  default_value_for :single_value, false
+  default_value_for :show,         true
 
   FIXTURE_FILE = FIXTURE_DIR.join("classifications.yml")
 
diff --git a/app/models/cloud_database_flavor.rb b/app/models/cloud_database_flavor.rb
index 535b7deb852..db4c39c4d00 100644
--- a/app/models/cloud_database_flavor.rb
+++ b/app/models/cloud_database_flavor.rb
@@ -8,7 +8,7 @@ class CloudDatabaseFlavor < ApplicationRecord
 
   virtual_total :total_cloud_databases, :cloud_databases
 
-  attribute :enabled, :default => true
+  default_value_for :enabled, true
 
   scope :active, -> { where(:enabled => true) }
 end
diff --git a/app/models/dialog.rb b/app/models/dialog.rb
index a538548d107..854436bdb54 100644
--- a/app/models/dialog.rb
+++ b/app/models/dialog.rb
@@ -4,7 +4,7 @@ class Dialog < ApplicationRecord
   # The following gets around a glob symbolic link issue
   YAML_FILES_PATTERN = "{,*/**/}*.{yaml,yml}".freeze
 
-  attribute :system, :default => false
+  default_value_for :system, false
   has_many :dialog_tabs, -> { order(:position) }, :dependent => :destroy
   validate :validate_children
 
diff --git a/app/models/dialog_field.rb b/app/models/dialog_field.rb
index 0b9e2435e2d..0eed881d842 100644
--- a/app/models/dialog_field.rb
+++ b/app/models/dialog_field.rb
@@ -29,10 +29,10 @@ class DialogField < ApplicationRecord
   validates :name, :exclusion => {:in      => %w(action controller),
                                   :message => "Field Name %{value} is reserved."}
 
-  attribute :required, :default => false
-  attribute :visible,  :default => true
+  default_value_for :required, false
+  default_value_for(:visible) { true }
   validates :visible, inclusion: { in: [ true, false ] }
-  attribute :load_values_on_init, :default => true
+  default_value_for :load_values_on_init, true
 
   serialize :values
   serialize :values_method_options,   Hash
diff --git a/app/models/endpoint.rb b/app/models/endpoint.rb
index 95bc4232bcb..18d3ce7449e 100644
--- a/app/models/endpoint.rb
+++ b/app/models/endpoint.rb
@@ -3,7 +3,7 @@
 class Endpoint < ApplicationRecord
   belongs_to :resource, :polymorphic => true
 
-  attribute :verify_ssl, :default => OpenSSL::SSL::VERIFY_PEER
+  default_value_for :verify_ssl, OpenSSL::SSL::VERIFY_PEER
   validates :verify_ssl, :inclusion => {:in => [OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER]}
   validates :port, :numericality => {:only_integer => true, :allow_nil => true, :greater_than => 0}
   validates :url, :uniqueness_when_changed => true, :allow_blank => true, :unless => :allow_duplicate_url?
diff --git a/app/models/ext_management_system.rb b/app/models/ext_management_system.rb
index 7f96a31626f..13825b5e4eb 100644
--- a/app/models/ext_management_system.rb
+++ b/app/models/ext_management_system.rb
@@ -306,7 +306,7 @@ def validate_zone_not_maintenance_when_ems_enabled?
   alias_method :clusters, :ems_clusters # Used by web-services to return clusters as the property name
   alias_attribute :to_s, :name
 
-  attribute :enabled, :default => true
+  default_value_for :enabled, true
 
   # Move ems to maintenance zone and backup current one
   # @param orig_zone [Integer] because of zone of child manager can be changed by parent manager's ensure_managers() callback
diff --git a/app/models/flavor.rb b/app/models/flavor.rb
index 6b1d19ea31a..2830d8df38d 100644
--- a/app/models/flavor.rb
+++ b/app/models/flavor.rb
@@ -12,7 +12,7 @@ class Flavor < ApplicationRecord
 
   virtual_total :total_vms, :vms
 
-  attribute :enabled, :default => true
+  default_value_for :enabled, true
 
   alias_attribute :cpus, :cpu_total_cores
   alias_attribute :cpu_cores, :cpu_cores_per_socket
diff --git a/app/models/git_repository.rb b/app/models/git_repository.rb
index f98fcc44e1b..f19b91c19bc 100644
--- a/app/models/git_repository.rb
+++ b/app/models/git_repository.rb
@@ -11,7 +11,7 @@ class GitRepository < ApplicationRecord
 
   validates :url, :format => Regexp.union(URI.regexp(%w[http https file ssh]), /\A[-\w:.]+@.*:/), :allow_nil => false
 
-  attribute :verify_ssl, :default => OpenSSL::SSL::VERIFY_PEER
+  default_value_for :verify_ssl, OpenSSL::SSL::VERIFY_PEER
   validates :verify_ssl, :inclusion => {:in => [OpenSSL::SSL::VERIFY_NONE, OpenSSL::SSL::VERIFY_PEER]}
 
   has_many :git_branches, :dependent => :destroy
diff --git a/app/models/manageiq/providers/cloud_manager/template.rb b/app/models/manageiq/providers/cloud_manager/template.rb
index 0188e16c47a..21df64042d5 100644
--- a/app/models/manageiq/providers/cloud_manager/template.rb
+++ b/app/models/manageiq/providers/cloud_manager/template.rb
@@ -1,5 +1,5 @@
 class ManageIQ::Providers::CloudManager::Template < ::MiqTemplate
-  attribute :cloud, :default => true
+  default_value_for :cloud, true
 
   virtual_column :image?, :type => :boolean
 
diff --git a/app/models/manageiq/providers/cloud_manager/vm.rb b/app/models/manageiq/providers/cloud_manager/vm.rb
index da8ca5b2dc1..ad058e9a3f4 100644
--- a/app/models/manageiq/providers/cloud_manager/vm.rb
+++ b/app/models/manageiq/providers/cloud_manager/vm.rb
@@ -26,7 +26,7 @@ class ManageIQ::Providers::CloudManager::Vm < ::Vm
 
   has_many   :host_aggregates,        :through => :host
 
-  attribute :cloud, :default => true
+  default_value_for :cloud, true
 
   virtual_column :ipaddresses, :type => :string_set, :uses => {:network_ports => :ipaddresses}
   virtual_column :floating_ip_addresses, :type => :string_set, :uses => {:network_ports => :floating_ip_addresses}
diff --git a/app/models/manageiq/providers/embedded_automation_manager/configuration_script_source.rb b/app/models/manageiq/providers/embedded_automation_manager/configuration_script_source.rb
index c8b7e6cfaf1..02a0d99d5bc 100644
--- a/app/models/manageiq/providers/embedded_automation_manager/configuration_script_source.rb
+++ b/app/models/manageiq/providers/embedded_automation_manager/configuration_script_source.rb
@@ -11,8 +11,8 @@ class ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource
   validates :scm_type,   :presence => true, :inclusion => {:in => %w[git]}
   validates :scm_branch, :presence => true
 
-  attribute :scm_type, :default => "git"
-  attribute :scm_branch, :default => "master"
+  default_value_for :scm_type,   "git"
+  default_value_for :scm_branch, "master"
 
   belongs_to :git_repository, :autosave => true, :dependent => :destroy
   before_validation :sync_git_repository
diff --git a/app/models/manageiq/providers/infra_manager/template.rb b/app/models/manageiq/providers/infra_manager/template.rb
index 80ad7f5e6da..c8bf8e9a0df 100644
--- a/app/models/manageiq/providers/infra_manager/template.rb
+++ b/app/models/manageiq/providers/infra_manager/template.rb
@@ -1,5 +1,5 @@
 class ManageIQ::Providers::InfraManager::Template < MiqTemplate
-  attribute :cloud, :default => false
+  default_value_for :cloud, false
 
   def self.display_name(number = 1)
     n_('Template', 'Templates', number)
diff --git a/app/models/manageiq/providers/infra_manager/vm.rb b/app/models/manageiq/providers/infra_manager/vm.rb
index b6b18ea2cb6..b222713b4fd 100644
--- a/app/models/manageiq/providers/infra_manager/vm.rb
+++ b/app/models/manageiq/providers/infra_manager/vm.rb
@@ -1,5 +1,5 @@
 class ManageIQ::Providers::InfraManager::Vm < ::Vm
-  attribute :cloud, :default => false
+  default_value_for :cloud, false
 
   # Show certain non-generic charts
   def cpu_mhz_available?
diff --git a/app/models/manageiq/providers/physical_infra_manager/vm.rb b/app/models/manageiq/providers/physical_infra_manager/vm.rb
index 3bfe51e0458..aacb29cba57 100644
--- a/app/models/manageiq/providers/physical_infra_manager/vm.rb
+++ b/app/models/manageiq/providers/physical_infra_manager/vm.rb
@@ -1,5 +1,5 @@
 class ManageIQ::Providers::PhysicalInfraManager::Vm < ::Vm
-  attribute :cloud, :default => false
+  default_value_for :cloud, false
 
   def self.display_name(number = 1)
     n_('Virtual Machine', 'Virtual Machines', number)
diff --git a/app/models/miq_ae_method.rb b/app/models/miq_ae_method.rb
index c57bf52f9ac..c3b2ac727ce 100644
--- a/app/models/miq_ae_method.rb
+++ b/app/models/miq_ae_method.rb
@@ -5,7 +5,7 @@ class MiqAeMethod < ApplicationRecord
   include MiqAeYamlImportExportMixin
   include RelativePathMixin
 
-  attribute :embedded_methods, :default => -> { [] }
+  default_value_for(:embedded_methods) { [] }
   # switch back to validates :exclusion once rails 6.1 issue is fixed
   # https://github.com/rails/rails/issues/41051
   validate :embedded_methods_not_nil
diff --git a/app/models/miq_approval.rb b/app/models/miq_approval.rb
index 1e9d4d92b3f..b7eb94539ec 100644
--- a/app/models/miq_approval.rb
+++ b/app/models/miq_approval.rb
@@ -3,7 +3,7 @@ class MiqApproval < ApplicationRecord
   belongs_to :stamper,  :class_name => "User"
   belongs_to :miq_request
 
-  attribute :state, :default => "pending"
+  default_value_for :state, "pending"
 
   def approver=(approver)
     super
diff --git a/app/models/miq_group.rb b/app/models/miq_group.rb
index a6c91740133..2d89f0957bc 100644
--- a/app/models/miq_group.rb
+++ b/app/models/miq_group.rb
@@ -32,8 +32,9 @@ class MiqGroup < ApplicationRecord
 
   serialize :settings
 
-  attribute :group_type, :default => USER_GROUP
-  attribute :sequence, :default => -> { next_sequence }
+  default_value_for :group_type, USER_GROUP
+  default_value_for(:sequence) { next_sequence }
+
   acts_as_miq_taggable
   include CustomAttributeMixin
   include ActiveVmAggregationMixin
@@ -80,7 +81,7 @@ def self.next_sequence
     #   https://github.com/rails/rails/pull/35280
     #
     # This was an attempt to fix "leaking scopes", however, in our case, we use
-    # this method both for our default value of :sequence, and it will get
+    # this method both for our +default_value_for(:sequence)+, and it will get
     # used as part of +.create_tenant_group+.
     #
     # As such, we need both +.current_scope+ for when we want to scope down the
diff --git a/app/models/miq_policy.rb b/app/models/miq_policy.rb
index dd2e34cbb9a..6b7226d8bbf 100644
--- a/app/models/miq_policy.rb
+++ b/app/models/miq_policy.rb
@@ -35,9 +35,9 @@ def self.policy_modes
   include YamlImportExportMixin
   before_validation :default_name_to_guid, :on => :create
 
-  attribute :towhat, :default => 'Vm'
-  attribute :active, :default => true
-  attribute :mode,   :default => 'control'
+  default_value_for :towhat, 'Vm'
+  default_value_for :active, true
+  default_value_for :mode,   'control'
 
   # NOTE: If another class references MiqPolicy through an ActiveRecord association,
   #   particularly has_one and belongs_to, calling .conditions will result in
diff --git a/app/models/miq_provision_request.rb b/app/models/miq_provision_request.rb
index a5835fd9b49..d434078a47b 100644
--- a/app/models/miq_provision_request.rb
+++ b/app/models/miq_provision_request.rb
@@ -16,19 +16,15 @@ class MiqProvisionRequest < MiqRequest
   validates :source, :presence => true
   validate               :must_have_user
 
+  default_value_for :options,      :number_of_vms => 1
   default_value_for(:source_id)    { |r| r.get_option(:src_vm_id) || r.get_option(:source_id) }
-  attribute :source_type, :default => "VmOrTemplate"
+  default_value_for :source_type,  "VmOrTemplate"
 
   virtual_column :provision_type, :type => :string
 
   include MiqProvisionMixin
   include MiqProvisionQuotaMixin
 
-  # Setup default coming back from the default serialized Hash
-  def options
-    super.tap { |s| s[:number_of_vms] = 1 unless s.key?(:number_of_vms) }
-  end
-
   def self.request_task_class_from(attribs)
     source_id = MiqRequestMixin.get_option(:src_vm_id, nil, attribs['options'])
     vm_or_template = source_vm_or_template!(source_id)
diff --git a/app/models/miq_request.rb b/app/models/miq_request.rb
index b44f0be8cac..e8048312710 100644
--- a/app/models/miq_request.rb
+++ b/app/models/miq_request.rb
@@ -25,10 +25,11 @@ class MiqRequest < ApplicationRecord
   serialize   :options, Hash
 
   default_value_for(:message)       { |r| "#{r.class::TASK_DESCRIPTION} - Request Created" }
-  attribute :request_state, :default => 'pending'
+  default_value_for :options,       {}
+  default_value_for :request_state, 'pending'
   default_value_for(:request_type)  { |r| r.request_types.first }
-  attribute :status,  :default => 'Ok'
-  attribute :process, :default => true
+  default_value_for :status,        'Ok'
+  default_value_for :process,       true
 
   validates_inclusion_of :approval_state, :in => %w(pending_approval approved denied), :message => "should be 'pending_approval', 'approved' or 'denied'"
   validates_inclusion_of :status,         :in => %w(Ok Warn Error Timeout Denied)
diff --git a/app/models/miq_request_task.rb b/app/models/miq_request_task.rb
index b48c9f7968c..21bc4cd8269 100644
--- a/app/models/miq_request_task.rb
+++ b/app/models/miq_request_task.rb
@@ -13,8 +13,10 @@ class MiqRequestTask < ApplicationRecord
   serialize   :phase_context, Hash
   serialize   :options,       Hash
 
-  attribute :state, :default => 'pending'
-  attribute :status, :default => 'Ok'
+  default_value_for :phase_context, {}
+  default_value_for :options,       {}
+  default_value_for :state,         'pending'
+  default_value_for :status,        'Ok'
 
   delegate :request_class, :task_description, :to => :class
 
diff --git a/app/models/miq_schedule.rb b/app/models/miq_schedule.rb
index b7017f0b108..519a764c578 100644
--- a/app/models/miq_schedule.rb
+++ b/app/models/miq_schedule.rb
@@ -44,9 +44,9 @@ class MiqSchedule < ApplicationRecord
   ALLOWED_CLASS_METHOD_ACTIONS = %w[automation_request].freeze
   IMPORT_CLASS_NAMES = %w[MiqSchedule].freeze
 
-  attribute :userid, :default => "system"
-  attribute :enabled, :default => true
-  attribute :zone_id, :default => -> { MiqServer.my_server.zone_id }
+  default_value_for :userid,  "system"
+  default_value_for :enabled, true
+  default_value_for(:zone_id) { MiqServer.my_server.zone_id }
 
   def set_start_time_and_prod_default
     run_at # Internally this will correct :start_time to UTC
diff --git a/app/models/miq_server.rb b/app/models/miq_server.rb
index 3fb5930d90f..1e0317fbe8d 100644
--- a/app/models/miq_server.rb
+++ b/app/models/miq_server.rb
@@ -25,8 +25,8 @@ class MiqServer < ApplicationRecord
   before_destroy          :validate_is_deleteable
   after_destroy           :destroy_linked_events_queue
 
-  attribute :name, :default => "EVM"
-  attribute :zone, :default => -> { Zone.default_zone }
+  default_value_for(:name, "EVM")
+  default_value_for(:zone) { Zone.default_zone }
 
   scope :active_miq_servers, -> { where(:status => STATUSES_ACTIVE) }
   scope :recently_active,    -> { where(:last_heartbeat => 10.minutes.ago.utc...Time.now.utc) }
diff --git a/app/models/miq_user_role.rb b/app/models/miq_user_role.rb
index 43380888e21..c7aca0e1654 100644
--- a/app/models/miq_user_role.rb
+++ b/app/models/miq_user_role.rb
@@ -14,7 +14,7 @@ class MiqUserRole < ApplicationRecord
 
   serialize :settings
 
-  attribute :read_only, :default => false
+  default_value_for :read_only, false
 
   FIXTURE_PATH = File.join(FIXTURE_DIR, table_name)
   FIXTURE_YAML = "#{FIXTURE_PATH}.yml"
diff --git a/app/models/miq_widget.rb b/app/models/miq_widget.rb
index a1f9f244fd1..b9d19ca673b 100644
--- a/app/models/miq_widget.rb
+++ b/app/models/miq_widget.rb
@@ -4,8 +4,8 @@
 class MiqWidget < ApplicationRecord
   include ReadOnlyMixin
 
-  attribute :enabled, :default => true
-  attribute :read_only, :default => false
+  default_value_for :enabled, true
+  default_value_for :read_only, false
 
   DEFAULT_ROW_COUNT = 5
   IMPORT_CLASS_NAMES = %w(MiqWidget).freeze
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 723d8032cf9..def5d7cad54 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -16,6 +16,7 @@ class Notification < ApplicationRecord
   before_save :backup_subject_name
 
   serialize :options, Hash
+  default_value_for(:options) { Hash.new }
 
   validate :complete_bindings
 
diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb
index 75efb01b7e1..644a21302a4 100644
--- a/app/models/notification_recipient.rb
+++ b/app/models/notification_recipient.rb
@@ -1,7 +1,7 @@
 class NotificationRecipient < ApplicationRecord
   belongs_to :notification
   belongs_to :user
-  attribute :seen, :default => false
+  default_value_for :seen, false
   virtual_column :details, :type => :string
 
   scope :unseen, -> { where(:seen => false) }
diff --git a/app/models/orchestration_stack_retire_task.rb b/app/models/orchestration_stack_retire_task.rb
index a5674f09a10..ce935687379 100644
--- a/app/models/orchestration_stack_retire_task.rb
+++ b/app/models/orchestration_stack_retire_task.rb
@@ -1,5 +1,5 @@
 class OrchestrationStackRetireTask < MiqRetireTask
-  attribute :request_type, :default => "orchestration_stack_retire"
+  default_value_for :request_type, "orchestration_stack_retire"
 
   def self.base_model
     OrchestrationStackRetireTask
diff --git a/app/models/orchestration_template.rb b/app/models/orchestration_template.rb
index acddcf985e7..fe1c674b77e 100644
--- a/app/models/orchestration_template.rb
+++ b/app/models/orchestration_template.rb
@@ -8,8 +8,8 @@ class OrchestrationTemplate < ApplicationRecord
   has_many :stacks, :class_name => "OrchestrationStack"
   has_one :picture, :dependent => :destroy, :as => :resource, :autosave => true
 
-  attribute :draft, :default => false
-  attribute :orderable, :default => true
+  default_value_for :draft, false
+  default_value_for :orderable, true
 
   validates :md5,
             :uniqueness_when_changed => {:scope => :draft, :message => "of content already exists (content must be unique)"},
diff --git a/app/models/pxe_server.rb b/app/models/pxe_server.rb
index 821a9dc4608..27efdb88b82 100644
--- a/app/models/pxe_server.rb
+++ b/app/models/pxe_server.rb
@@ -5,7 +5,7 @@ class PxeServer < ApplicationRecord
 
   alias_attribute :description, :name
 
-  attribute :customization_directory, :default => ""
+  default_value_for :customization_directory, ""
 
   serialize :visibility
 
diff --git a/app/models/service.rb b/app/models/service.rb
index 111df16de42..48286f9ba29 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -89,10 +89,10 @@ class Service < ApplicationRecord
 
   validates :name, :presence => true
 
-  attribute :visible, :default => false
-  attribute :initiator, :default => 'user'
-  attribute :lifecycle_state, :default => 'unprovisioned'
-  attribute :retired, :default => false
+  default_value_for :visible, false
+  default_value_for :initiator, 'user'
+  default_value_for :lifecycle_state, 'unprovisioned'
+  default_value_for :retired, false
 
   validates :visible, :inclusion => { :in => [true, false] }
   validates :retired, :inclusion => { :in => [true, false] }
diff --git a/app/models/service_reconfigure_request.rb b/app/models/service_reconfigure_request.rb
index b8c4bdeffd1..04ea8e5f762 100644
--- a/app/models/service_reconfigure_request.rb
+++ b/app/models/service_reconfigure_request.rb
@@ -9,7 +9,7 @@ class ServiceReconfigureRequest < MiqRequest
   virtual_has_one :provision_dialog
 
   default_value_for(:source_id)    { |r| r.get_option(:src_id) }
-  attribute :source_type, :default => SOURCE_CLASS_NAME
+  default_value_for :source_type,  SOURCE_CLASS_NAME
 
   def my_role(_action = nil)
     'ems_operations'
diff --git a/app/models/service_resource.rb b/app/models/service_resource.rb
index bad2f55593a..219e9bc838c 100644
--- a/app/models/service_resource.rb
+++ b/app/models/service_resource.rb
@@ -10,10 +10,10 @@ class ServiceResource < ApplicationRecord
   belongs_to :resource, :polymorphic => true
   belongs_to :source,   :polymorphic => true
 
-  attribute :group_idx,       :default => 0
-  attribute :scaling_min,     :default => 1
-  attribute :scaling_max,     :default => -1
-  attribute :provision_index, :default => 0
+  default_value_for :group_idx, 0
+  default_value_for :scaling_min, 1
+  default_value_for :scaling_max, -1
+  default_value_for :provision_index, 0
 
   virtual_column :resource_name,        :type => :string
   virtual_column :resource_description, :type => :string
diff --git a/app/models/service_retire_task.rb b/app/models/service_retire_task.rb
index 5a7aef24bff..f706c704c52 100644
--- a/app/models/service_retire_task.rb
+++ b/app/models/service_retire_task.rb
@@ -1,5 +1,5 @@
 class ServiceRetireTask < MiqRetireTask
-  attribute :request_type, :default => "service_retire"
+  default_value_for :request_type, "service_retire"
 
   def self.base_model
     ServiceRetireTask
diff --git a/app/models/service_template.rb b/app/models/service_template.rb
index c8e8d5ad868..a29f5b28c3e 100644
--- a/app/models/service_template.rb
+++ b/app/models/service_template.rb
@@ -59,8 +59,8 @@ class ServiceTemplate < ApplicationRecord
   virtual_column   :archived,                     :type => :boolean
   virtual_column   :active,                       :type => :boolean
 
-  attribute :internal, :default => false
-  attribute :service_type, :default => SERVICE_TYPE_ATOMIC
+  default_value_for :internal, false
+  default_value_for :service_type, SERVICE_TYPE_ATOMIC
   default_value_for(:generic_subtype) { |st| 'custom' if st.prov_type == 'generic' }
 
   virtual_has_one :config_info, :class_name => "Hash"
diff --git a/app/models/service_template_provision_request.rb b/app/models/service_template_provision_request.rb
index e6a3a12539b..cbd96118e56 100644
--- a/app/models/service_template_provision_request.rb
+++ b/app/models/service_template_provision_request.rb
@@ -17,8 +17,8 @@ class ServiceTemplateProvisionRequest < MiqRequest
   virtual_has_one :user
 
   default_value_for(:source_id)    { |r| r.get_option(:src_id) }
-  attribute :source_type, :default => SOURCE_CLASS_NAME
-  attribute :process, :default => false
+  default_value_for :source_type,  SOURCE_CLASS_NAME
+  default_value_for :process,      false
 
   delegate :picture, :to => :service_template, :allow_nil => true
 
diff --git a/app/models/share.rb b/app/models/share.rb
index 086a45e7f45..3f014a5ee10 100644
--- a/app/models/share.rb
+++ b/app/models/share.rb
@@ -11,7 +11,7 @@ class Share < ApplicationRecord
   validates :tenant,               :presence => true
   validates :user,                 :presence => true
 
-  attribute :allow_tenant_inheritance, :default => false
+  default_value_for :allow_tenant_inheritance, false
 
   scope :by_tenant_inheritance, ->(tenant) do
     where(:tenant => tenant.accessible_tenant_ids(:ancestor_ids),
diff --git a/app/models/system_console.rb b/app/models/system_console.rb
index 38ae9ce52a0..4ac3312cc9a 100644
--- a/app/models/system_console.rb
+++ b/app/models/system_console.rb
@@ -2,7 +2,7 @@ class SystemConsole < ApplicationRecord
   belongs_to :vm
   belongs_to :user
 
-  attribute :opened, :default => false
+  default_value_for :opened, false
 
   validates :url_secret, :uniqueness_when_changed => true
 
diff --git a/app/models/tenant.rb b/app/models/tenant.rb
index e499bb26aed..92112d7c20e 100644
--- a/app/models/tenant.rb
+++ b/app/models/tenant.rb
@@ -12,10 +12,10 @@ class Tenant < ApplicationRecord
 
   acts_as_miq_taggable
 
-  attribute :name,        :default => "My Company"
-  attribute :description, :default => "Tenant for My Company"
-  attribute :divisible,   :default => true
-  attribute :use_config_for_attributes, :default => false
+  default_value_for :name,        "My Company"
+  default_value_for :description, "Tenant for My Company"
+  default_value_for :divisible,   true
+  default_value_for :use_config_for_attributes, false
 
   before_destroy :ensure_can_be_destroyed
 
diff --git a/app/models/time_profile.rb b/app/models/time_profile.rb
index 5fbd21d465b..6ddbc001a62 100644
--- a/app/models/time_profile.rb
+++ b/app/models/time_profile.rb
@@ -4,6 +4,8 @@ class TimeProfile < ApplicationRecord
   DEFAULT_TZ = "UTC".freeze
 
   serialize :profile
+  default_value_for :days,  ALL_DAYS
+  default_value_for :hours, ALL_HOURS
 
   has_many  :miq_reports
   has_many  :metric_rollups
@@ -73,7 +75,7 @@ def tz_or_default(default_tz = DEFAULT_TZ)
   end
 
   def days
-    profile.fetch(:days, ALL_DAYS)
+    profile[:days]
   end
 
   def days=(arr)
@@ -83,7 +85,7 @@ def days=(arr)
   end
 
   def hours
-    profile.fetch(:hours, ALL_HOURS)
+    profile[:hours]
   end
 
   def hours=(arr)
diff --git a/app/models/user.rb b/app/models/user.rb
index 2662a956a2e..6bdda8b7beb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -55,8 +55,9 @@ class User < ApplicationRecord
   alias_method :authenticate_bcrypt, :authenticate
 
   serialize     :settings, Hash   # Implement settings column as a hash
+  default_value_for(:settings) { Hash.new }
 
-  attribute :failed_login_attempts, :default => 0
+  default_value_for :failed_login_attempts, 0
 
   scope :in_all_regions, ->(id) { where(:userid => User.default_scoped.where(:id => id).select(:userid)) }
 
diff --git a/app/models/vm_migrate_task.rb b/app/models/vm_migrate_task.rb
index d3e8ffc14d5..a4f79868b6c 100644
--- a/app/models/vm_migrate_task.rb
+++ b/app/models/vm_migrate_task.rb
@@ -2,7 +2,7 @@ class VmMigrateTask < MiqRequestTask
   alias_attribute :vm, :source
 
   validate :validate_request_type, :validate_state
-  attribute :request_type, :default => "vm_migrate"
+  default_value_for :request_type, "vm_migrate"
 
   AUTOMATE_DRIVES = true
 
diff --git a/app/models/vm_retire_request.rb b/app/models/vm_retire_request.rb
index ba31b1116d7..b42218a5788 100644
--- a/app/models/vm_retire_request.rb
+++ b/app/models/vm_retire_request.rb
@@ -4,7 +4,7 @@ class VmRetireRequest < MiqRetireRequest
   ACTIVE_STATES     = %w(retired) + base_class::ACTIVE_STATES
 
   default_value_for(:source_id)    { |r| r.get_option(:src_ids) }
-  attribute :source_type, :default => SOURCE_CLASS_NAME
+  default_value_for :source_type,  SOURCE_CLASS_NAME
 
   def my_zone
     vm = Vm.find_by(:id => options[:src_ids])
diff --git a/app/models/vm_retire_task.rb b/app/models/vm_retire_task.rb
index 3706b2ccea3..a4a26758221 100644
--- a/app/models/vm_retire_task.rb
+++ b/app/models/vm_retire_task.rb
@@ -1,6 +1,6 @@
 class VmRetireTask < MiqRetireTask
   alias_attribute :vm, :source
-  attribute :request_type, :default => "vm_retire"
+  default_value_for :request_type, "vm_retire"
 
   def self.base_model
     VmRetireTask
diff --git a/app/models/zone.rb b/app/models/zone.rb
index 33e000db171..322a85e928a 100644
--- a/app/models/zone.rb
+++ b/app/models/zone.rb
@@ -43,7 +43,7 @@ class Zone < ApplicationRecord
   include ConfigurationManagementMixin
 
   scope :visible, -> { where(:visible => true) }
-  attribute :visible, :default => true
+  default_value_for :visible, true
 
   def active_miq_servers
     MiqServer.active_miq_servers.where(:zone_id => id)
diff --git a/lib/uuid_mixin.rb b/lib/uuid_mixin.rb
index f9f3b2c3093..e7c0dc28863 100644
--- a/lib/uuid_mixin.rb
+++ b/lib/uuid_mixin.rb
@@ -1,8 +1,8 @@
 module UuidMixin
   extend ActiveSupport::Concern
   included do
-    attribute :guid, :default => -> { SecureRandom.uuid }
-    validates :guid, :uniqueness_when_changed => true, :presence => true
+    default_value_for(:guid) { SecureRandom.uuid }
+    validates :guid,  :uniqueness_when_changed => true, :presence => true
   end
 
   def dup
diff --git a/spec/lib/extensions/ar_yaml_spec.rb b/spec/lib/extensions/ar_yaml_spec.rb
index 58799bbc290..25e27acb526 100644
--- a/spec/lib/extensions/ar_yaml_spec.rb
+++ b/spec/lib/extensions/ar_yaml_spec.rb
@@ -10,7 +10,7 @@
     inst = Vm.new
     inst.access1 = 1
     inst.access2 = 2
-    result = YAML.safe_load(YAML.dump(inst), :permitted_classes => [Vm, ActiveModel::Attribute.const_get(:FromDatabase), ActiveModel::Attribute::const_get(:FromUser), ActiveModel::Attribute::UserProvidedDefault, ActiveModel::Type::String])
+    result = YAML.safe_load(YAML.dump(inst), :permitted_classes => [Vm, ActiveModel::Attribute.const_get(:FromDatabase), ActiveModel::Attribute::const_get(:FromUser), ActiveModel::Type::String])
     expect(result.access1).to eq(1)
     expect(result.access2).to eq(2)
   end
@@ -18,14 +18,14 @@
   it "attr_reader_that_yamls" do
     inst = Vm.new
     inst.instance_variable_set("@read1", 1)
-    result = YAML.safe_load(YAML.dump(inst), :permitted_classes => [Vm, ActiveModel::Attribute.const_get(:FromDatabase), ActiveModel::Attribute::const_get(:FromUser), ActiveModel::Attribute::UserProvidedDefault, ActiveModel::Type::String])
+    result = YAML.safe_load(YAML.dump(inst), :permitted_classes => [Vm, ActiveModel::Attribute.const_get(:FromDatabase), ActiveModel::Attribute::const_get(:FromUser), ActiveModel::Type::String])
     expect(result.read1).to eq(1)
   end
 
   it "attr_writer_that_yamls" do
     inst = Vm.new
     inst.write1 = 1
-    result = YAML.safe_load(YAML.dump(inst), :permitted_classes => [Vm, ActiveModel::Attribute.const_get(:FromDatabase), ActiveModel::Attribute::const_get(:FromUser), ActiveModel::Attribute::UserProvidedDefault, ActiveModel::Type::String])
+    result = YAML.safe_load(YAML.dump(inst), :permitted_classes => [Vm, ActiveModel::Attribute.const_get(:FromDatabase), ActiveModel::Attribute::const_get(:FromUser), ActiveModel::Type::String])
     expect(result.instance_variable_get("@write1")).to eq(1)
   end
 end
diff --git a/spec/lib/uniqueness_when_changed_validator_spec.rb b/spec/lib/uniqueness_when_changed_validator_spec.rb
index 82bfe10034e..554e6c57c34 100644
--- a/spec/lib/uniqueness_when_changed_validator_spec.rb
+++ b/spec/lib/uniqueness_when_changed_validator_spec.rb
@@ -3,7 +3,7 @@
   describe "#uniqueness_when_changed" do
     it "queries for a new record" do
       alert = FactoryBot.build(:miq_alert)
-      expect { alert.valid? }.to make_database_queries(:count => 2)
+      expect { alert.valid? }.to make_database_queries(:count => 1)
     end
 
     it "queries for a changed record" do
diff --git a/spec/models/blacklisted_event_spec.rb b/spec/models/blacklisted_event_spec.rb
index 80cd74d6a41..dea32ba815e 100644
--- a/spec/models/blacklisted_event_spec.rb
+++ b/spec/models/blacklisted_event_spec.rb
@@ -30,46 +30,12 @@
     end
   end
 
-  context "#enabled=" do
-    it 'new record' do
-      f = FactoryBot.create(:blacklisted_event, :event_name => 'event_1')
-      expect(f.enabled).to be_truthy
-
-      f.enabled = false
-      expect(f.enabled).to be_falsey
-    end
-
-    it 'persisted' do
-      f = FactoryBot.build(:blacklisted_event, :event_name => 'event_1')
-      expect(f.enabled).to be_truthy
-
-      f.enabled = false
-      expect(f.enabled).to be_falsey
-    end
-
-    it "log creation" do
-      expect($audit_log).to receive(:info).with(a_string_including("Creating")).once
-      FactoryBot.create(:blacklisted_event, :event_name => 'event_1')
-    end
-
-    it "doesn't log changed on creation" do
-      expect($audit_log).to receive(:info).with(a_string_including("changed")).never
-      FactoryBot.create(:blacklisted_event, :event_name => 'event_1')
-    end
-
-    it 'logs a message when changed' do
-      f = FactoryBot.create(:blacklisted_event, :event_name => 'event_1')
-
-      expect($audit_log).to receive(:info).with(a_string_including("changed")).once
-      f.update(:enabled => false)
-    end
-
-    it 'does not log a message when unchanged' do
-      f = FactoryBot.create(:blacklisted_event, :event_name => 'event_1')
-
-      expect($audit_log).to receive(:info).with(a_string_including("changed")).never
-      f.update(:enabled => f.enabled)
-    end
+  it '#enabled=' do
+    User.current_user = FactoryBot.create(:user)
+    f = FactoryBot.create(:blacklisted_event, :event_name => 'event_1')
+    expect(f.enabled).to be_truthy
 
+    f.enabled = false
+    expect(f.enabled).to be_falsey
   end
 end