diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 9b059b41d3f..f91565511f5 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -9,7 +9,7 @@
 	g_amt = 250
 
 	//	Motion, EMP-Proof, X-Ray
-	var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/osmium, /obj/item/weapon/stock_parts/scanning_module)
+	var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/device/analyzer)
 	var/list/upgrades = list()
 	var/state = 0
 	var/busy = 0
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 21a9dc10616..84ec6734e1b 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -53,14 +53,12 @@
 // CHECKS
 
 /obj/machinery/camera/proc/isEmpProof()
-	var/O = locate(/obj/item/stack/sheet/mineral/osmium) in assembly.upgrades
+	var/O = locate(/obj/item/stack/sheet/mineral/plasma) in assembly.upgrades
 	return O
 
 /obj/machinery/camera/proc/isXRay()
-	var/obj/item/weapon/stock_parts/scanning_module/O = locate(/obj/item/weapon/stock_parts/scanning_module) in assembly.upgrades
-	if (O && O.rating >= 2)
-		return O
-	return null
+	var/O = locate(/obj/item/device/analyzer) in assembly.upgrades
+	return O
 
 /obj/machinery/camera/proc/isMotion()
 	var/O = locate(/obj/item/device/assembly/prox_sensor) in assembly.upgrades
@@ -69,11 +67,11 @@
 // UPGRADE PROCS
 
 /obj/machinery/camera/proc/upgradeEmpProof()
-	assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/osmium(assembly))
+	assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly))
 	setPowerUsage()
 
 /obj/machinery/camera/proc/upgradeXRay()
-	assembly.upgrades.Add(new /obj/item/weapon/stock_parts/scanning_module/adv(assembly))
+	assembly.upgrades.Add(new /obj/item/device/analyzer(assembly))
 	setPowerUsage()
 
 // If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list.