diff --git a/app/models/container.rb b/app/models/container.rb
index 09e2250cb91..8fbcba3e29a 100644
--- a/app/models/container.rb
+++ b/app/models/container.rb
@@ -2,6 +2,7 @@ class Container < ApplicationRecord
   include SupportsFeatureMixin
   include NewWithTypeStiMixin
   include ArchivedMixin
+  include OldEmsMixin
   include_concern 'Purging'
 
   belongs_to :container_group
diff --git a/app/models/container_group.rb b/app/models/container_group.rb
index f0c93ba3493..51c99b42bed 100644
--- a/app/models/container_group.rb
+++ b/app/models/container_group.rb
@@ -6,6 +6,7 @@ class ContainerGroup < ApplicationRecord
   include NewWithTypeStiMixin
   include TenantIdentityMixin
   include ArchivedMixin
+  include OldEmsMixin
   include CustomActionsMixin
   include CockpitSupportMixin
   include_concern 'Purging'
diff --git a/app/models/container_image.rb b/app/models/container_image.rb
index 053cd99f3d0..541abdf8a97 100644
--- a/app/models/container_image.rb
+++ b/app/models/container_image.rb
@@ -5,6 +5,7 @@ class ContainerImage < ApplicationRecord
   include TenantIdentityMixin
   include CustomAttributeMixin
   include ArchivedMixin
+  include OldEmsMixin
   include NewWithTypeStiMixin
   include CustomActionsMixin
   include_concern 'Purging'
diff --git a/app/models/container_node.rb b/app/models/container_node.rb
index fb445c355fc..b64fe6b4f22 100644
--- a/app/models/container_node.rb
+++ b/app/models/container_node.rb
@@ -6,6 +6,7 @@ class ContainerNode < ApplicationRecord
   include TenantIdentityMixin
   include SupportsFeatureMixin
   include ArchivedMixin
+  include OldEmsMixin
   include CockpitMixin
   include CustomActionsMixin
   include_concern 'Purging'
diff --git a/app/models/container_project.rb b/app/models/container_project.rb
index c7f57e7fd56..8b4a50e4240 100644
--- a/app/models/container_project.rb
+++ b/app/models/container_project.rb
@@ -2,6 +2,7 @@ class ContainerProject < ApplicationRecord
   include SupportsFeatureMixin
   include CustomAttributeMixin
   include ArchivedMixin
+  include OldEmsMixin
   include CustomActionsMixin
   include_concern 'Purging'
   belongs_to :ext_management_system, :foreign_key => "ems_id"
diff --git a/app/models/mixins/archived_mixin.rb b/app/models/mixins/archived_mixin.rb
index 55555896202..b8f5f80b740 100644
--- a/app/models/mixins/archived_mixin.rb
+++ b/app/models/mixins/archived_mixin.rb
@@ -4,8 +4,6 @@ module ArchivedMixin
   included do
     scope :archived, -> { where.not(:deleted_on => nil) }
     scope :active, -> { where(:deleted_on => nil) }
-
-    belongs_to :old_ext_management_system, :foreign_key => :old_ems_id, :class_name => 'ExtManagementSystem'
   end
 
   def archived?
@@ -15,15 +13,4 @@ def archived?
   def active?
     deleted_on.nil?
   end
-
-  # Needed for metrics
-  def my_zone
-    if ext_management_system.present?
-      ext_management_system.my_zone
-    elsif old_ext_management_system.present?
-      # Archived container entities need to retain their zone for metric collection
-      # This makes the association more complex and might need a performance fix
-      old_ext_management_system.my_zone
-    end
-  end
 end
diff --git a/app/models/mixins/old_ems_mixin.rb b/app/models/mixins/old_ems_mixin.rb
new file mode 100644
index 00000000000..9ec94e151a9
--- /dev/null
+++ b/app/models/mixins/old_ems_mixin.rb
@@ -0,0 +1,18 @@
+module OldEmsMixin
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :old_ext_management_system, :foreign_key => :old_ems_id, :class_name => 'ExtManagementSystem'
+  end
+
+  # Needed for metrics
+  def my_zone
+    if ext_management_system.present?
+      ext_management_system.my_zone
+    elsif old_ext_management_system.present?
+      # Archived container entities need to retain their zone for metric collection
+      # This makes the association more complex and might need a performance fix
+      old_ext_management_system.my_zone
+    end
+  end
+end