diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index f9d9f363b862..ca7de2ba17dd 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -52,6 +52,9 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 	icon_state = "terminal"
 	z_restricted = FALSE
 
+/obj/structure/machinery/computer/cryopod/upp
+	cryotype = FACTION_UPP
+
 /obj/structure/machinery/computer/cryopod/attack_remote()
 	src.attack_hand()
 
@@ -239,8 +242,10 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 				dept_console = GLOB.frozen_items["Med"]
 			if(JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)
 				dept_console = GLOB.frozen_items["Eng"]
-			if(JOB_PREDATOR)
-				dept_console = GLOB.frozen_items["Yautja"]
+
+
+		if(cryo_human.faction != FACTION_MARINE)
+			dept_console = GLOB.frozen_items[cryo_human.faction]
 
 		if(cryo_human.job in FAX_RESPONDER_JOB_LIST)
 			cryo_human.despawn_fax_responder()
@@ -560,6 +565,8 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 		return TRUE
 	if(no_store_pod)
 		return TRUE
+	if(occupant.faction != FACTION_MARINE)
+		return TRUE
 	return FALSE