diff --git a/Mage.Sets/src/mage/cards/c/Cryptek.java b/Mage.Sets/src/mage/cards/c/Cryptek.java
new file mode 100644
index 00000000000..30e6cea45b3
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/Cryptek.java
@@ -0,0 +1,103 @@
+package mage.cards.c;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.DelayedTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
+import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class Cryptek extends CardImpl {
+
+    private static final FilterPermanent filter
+            = new FilterControlledCreaturePermanent("another target artifact creature you control");
+
+    static {
+        filter.add(AnotherPredicate.instance);
+        filter.add(CardType.ARTIFACT.getPredicate());
+    }
+
+    public Cryptek(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{B}");
+
+        this.subtype.add(SubType.NECRON);
+        this.subtype.add(SubType.WIZARD);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // {1}{B}, {T}: Choose another target artifact creature you control. When that creature dies this turn, return it to the battlefield tapped under your control.
+        Ability ability = new SimpleActivatedAbility(
+                new CreateDelayedTriggeredAbilityEffect(new CryptekTriggeredAbility()), new ManaCostsImpl<>("{1}{B}")
+        );
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetPermanent(filter));
+        this.addAbility(ability);
+    }
+
+    private Cryptek(final Cryptek card) {
+        super(card);
+    }
+
+    @Override
+    public Cryptek copy() {
+        return new Cryptek(this);
+    }
+}
+
+class CryptekTriggeredAbility extends DelayedTriggeredAbility {
+
+    CryptekTriggeredAbility() {
+        super(new ReturnFromGraveyardToBattlefieldTargetEffect(true), Duration.EndOfTurn, true, false);
+    }
+
+    private CryptekTriggeredAbility(final CryptekTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public CryptekTriggeredAbility copy() {
+        return new CryptekTriggeredAbility(this);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.ZONE_CHANGE;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+        return zEvent.isDiesEvent()
+                && this
+                .getEffects()
+                .stream()
+                .map(Effect::getTargetPointer)
+                .map(targetPointer -> targetPointer.getFirst(game, this))
+                .anyMatch(zEvent.getTargetId()::equals);
+    }
+
+    @Override
+    public String getRule() {
+        return "When that creature dies this turn, return it to the battlefield tapped under your control.";
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/Warhammer40000.java b/Mage.Sets/src/mage/sets/Warhammer40000.java
index 99003aa2712..03b4f546ccd 100644
--- a/Mage.Sets/src/mage/sets/Warhammer40000.java
+++ b/Mage.Sets/src/mage/sets/Warhammer40000.java
@@ -81,6 +81,7 @@ public final class Warhammer40000 extends ExpansionSet {
         cards.add(new SetCardInfo("Convergence of Dominion", 154, Rarity.RARE, mage.cards.c.ConvergenceOfDominion.class));
         cards.add(new SetCardInfo("Cranial Plating", 236, Rarity.UNCOMMON, mage.cards.c.CranialPlating.class));
         cards.add(new SetCardInfo("Crumbling Necropolis", 273, Rarity.UNCOMMON, mage.cards.c.CrumblingNecropolis.class));
+        cards.add(new SetCardInfo("Cryptek", 33, Rarity.RARE, mage.cards.c.Cryptek.class));
         cards.add(new SetCardInfo("Cryptothrall", 155, Rarity.RARE, mage.cards.c.Cryptothrall.class));
         cards.add(new SetCardInfo("Cultivate", 211, Rarity.COMMON, mage.cards.c.Cultivate.class));
         cards.add(new SetCardInfo("Cybernetica Datasmith", 114, Rarity.RARE, mage.cards.c.CyberneticaDatasmith.class));