diff --git a/Content.Server/Jobs/AddComponentSpecial.cs b/Content.Server/Jobs/AddComponentSpecial.cs
index 6489068d1fb7..3bac923656c1 100644
--- a/Content.Server/Jobs/AddComponentSpecial.cs
+++ b/Content.Server/Jobs/AddComponentSpecial.cs
@@ -1,34 +1,22 @@
 using Content.Shared.Roles;
-using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
 
-namespace Content.Server.Jobs
-{
-    [UsedImplicitly]
-    public sealed partial class AddComponentSpecial : JobSpecial
-    {
-        [DataField("components")]
-        [AlwaysPushInheritance]
-        public ComponentRegistry Components { get; private set; } = new();
+namespace Content.Server.Jobs;
 
-        public override void AfterEquip(EntityUid mob)
-        {
-            // now its a registry of components, still throws i bet.
-            // TODO: This is hot garbage and probably needs an engine change to not be a POS.
-            var factory = IoCManager.Resolve<IComponentFactory>();
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var serializationManager = IoCManager.Resolve<ISerializationManager>();
+public sealed partial class AddComponentSpecial : JobSpecial
+{
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = new();
 
-            foreach (var (name, data) in Components)
-            {
-                var component = (Component) factory.GetComponent(name);
+    /// <summary>
+    /// If this is true then existing components will be removed and replaced with these ones.
+    /// </summary>
+    [DataField]
+    public bool RemoveExisting = true;
 
-                var temp = (object)component;
-                serializationManager.CopyTo(data.Component, ref temp);
-                entityManager.RemoveComponent(mob, temp!.GetType());
-                entityManager.AddComponent(mob, (Component)temp);
-            }
-        }
+    public override void AfterEquip(EntityUid mob)
+    {
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        entMan.AddComponents(mob, Components, removeExisting: RemoveExisting);
     }
 }
diff --git a/Content.Server/Jobs/RemoveComponentSpecial.cs b/Content.Server/Jobs/RemoveComponentSpecial.cs
new file mode 100644
index 000000000000..7a9b03b3ba0a
--- /dev/null
+++ b/Content.Server/Jobs/RemoveComponentSpecial.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Jobs;
+
+public sealed partial class RemoveComponentSpecial : JobSpecial
+{
+    [DataField(required: true)]
+    public ComponentRegistry Components { get; private set; } = new();
+
+    public override void AfterEquip(EntityUid mob)
+    {
+        var entMan = IoCManager.Resolve<IEntityManager>();
+        entMan.RemoveComponents(mob, Components);
+    }
+}