diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm
index e0ba0084bb..127e8b1ba1 100644
--- a/code/datums/ammo/bullet/special_ammo.dm
+++ b/code/datums/ammo/bullet/special_ammo.dm
@@ -89,6 +89,12 @@
 	shell_speed = 2*AMMO_SPEED_TIER_6
 	accuracy = HIT_ACCURACY_TIER_5
 
+/datum/ammo/bullet/turret/upp
+	damage = 45
+	penetration = ARMOR_PENETRATION_TIER_2
+	accuracy_var_low = PROJECTILE_VARIANCE_TIER_2
+	accuracy_var_high = PROJECTILE_VARIANCE_TIER_2
+
 /datum/ammo/bullet/turret/dumb
 	icon_state = "bullet"
 	flags_ammo_behavior = AMMO_BALLISTIC
diff --git a/code/modules/defenses/defenses.dm b/code/modules/defenses/defenses.dm
index 5ad8dbdc4b..2ff8ffe11c 100644
--- a/code/modules/defenses/defenses.dm
+++ b/code/modules/defenses/defenses.dm
@@ -2,7 +2,9 @@
 	name = "Don't see this"
 	desc = "Call for help."
 	icon = 'icons/obj/structures/machinery/defenses/sentry.dmi'
-	icon_state = "defense_base_off"
+	icon_state = "defense_base"
+	var/icon_off = "defense_base_off"
+	var/icon_on = "defense_base"
 	anchored = TRUE
 	unacidable = TRUE
 	density = TRUE
@@ -69,9 +71,9 @@
 	if(!composite_icon)
 		icon_state = null
 	else if(turned_on)
-		icon_state = "defense_base"
+		icon_state = icon_on
 	else
-		icon_state = "defense_base_off"
+		icon_state = icon_off
 
 
 /obj/structure/machinery/defenses/get_examine_text(mob/user)
diff --git a/code/modules/defenses/handheld.dm b/code/modules/defenses/handheld.dm
index d19b61b305..d1f9a3cf20 100644
--- a/code/modules/defenses/handheld.dm
+++ b/code/modules/defenses/handheld.dm
@@ -135,9 +135,9 @@
 /obj/item/defenses/handheld/sentry/upp
 	name = "handheld UPPA 32-H sentry gun"
 	desc = "A compact version of the UPPA defenses. Designed for quick deployment of the associated type in the field."
+	icon_state = "UPP uac_sentry_handheld"
 	defense_type = /obj/structure/machinery/defenses/sentry/upp
 
-
 // FLAMER BASE AND UPGRADES
 /obj/item/defenses/handheld/sentry/flamer
 	name = "handheld UA 42-F sentry flamer"
diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm
index 70231319ab..075b534ac1 100644
--- a/code/modules/defenses/sentry.dm
+++ b/code/modules/defenses/sentry.dm
@@ -762,6 +762,9 @@
 /obj/structure/machinery/defenses/sentry/upp
 	name = "\improper UPPA 32-H sentry gun"
 	desc = "A deployable, semi-automated turret with AI targeting capabilities. Armed with an AK-500 Autocannon and a 500-round drum magazine."
+	icon_state = "upp_defense_base"
+	icon_on = "upp_defense_base"
+	icon_off = "upp_defense_base_off"
 	choice_categories = list(
 		SENTRY_CATEGORY_IFF = list(FACTION_UPP, FACTION_HUMAN),
 	)
@@ -770,6 +773,11 @@
 		SENTRY_CATEGORY_IFF = FACTION_UPP,
 	)
 	start_up_message = "Sentry mounted and loaded. Glory to the UPP."
+	defense_type = "UPP"
+	handheld_type = /obj/item/defenses/handheld/sentry/upp
+	fire_delay = 1.2
+	firing_sound = 'sound/weapons/gun_m56d_auto.ogg'
+	ammo = new /obj/item/ammo_magazine/sentry/upp
 
 #undef SENTRY_FIREANGLE
 #undef SENTRY_RANGE
diff --git a/code/modules/projectiles/magazines/sentries.dm b/code/modules/projectiles/magazines/sentries.dm
index 4e88527805..301329fc3a 100644
--- a/code/modules/projectiles/magazines/sentries.dm
+++ b/code/modules/projectiles/magazines/sentries.dm
@@ -22,6 +22,13 @@
 /obj/item/ammo_magazine/sentry/premade/dumb
 	default_ammo = /datum/ammo/bullet/turret/dumb
 
+/obj/item/ammo_magazine/sentry/upp
+	name = "AK-500 ammo drum (7.62mm Caseless)"
+	desc = "An ammo drum of 7.62mm caseless rounds for the UPPA 32-H sentry. Just feed it into the sentry gun's ammo port when its ammo is depleted."
+	icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
+	icon_state = "sentry"
+	default_ammo = /datum/ammo/bullet/turret/upp
+
 /obj/item/ammo_magazine/sentry/shotgun
 	name = "12g buckshot drum"
 	desc = "An ammo drum of 50 12g buckshot drums for the UA 12-G Shotgun Sentry. Just feed it into the sentry gun's ammo port when its ammo is depleted."
diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi
index 5632ca3148..1e48bdfa65 100644
Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi differ
diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi
index 51bc441aef..0c0fcc473a 100644
Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi differ
diff --git a/icons/obj/structures/machinery/defenses/sentry.dmi b/icons/obj/structures/machinery/defenses/sentry.dmi
index 9b1d988f8e..16dd53d384 100644
Binary files a/icons/obj/structures/machinery/defenses/sentry.dmi and b/icons/obj/structures/machinery/defenses/sentry.dmi differ
diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm
index c2b8457ee8..947d71b406 100644
--- a/maps/map_files/chapaev/chapaev.dmm
+++ b/maps/map_files/chapaev/chapaev.dmm
@@ -2569,12 +2569,8 @@
 /area/golden_arrow/briefing)
 "yu" = (
 /obj/structure/surface/rack,
-/obj/item/ammo_magazine/sentry{
-	layer = 3.01;
-	name = "AK-500 ammo drum (7,62mm Caseless)";
-	desc = "An ammo drum of 500 7,62mm caseless rounds for the UPPA 32-H Sentry Gun. Just feed it into the sentry gun's ammo port when its ammo is depleted."
-	},
 /obj/item/device/motiondetector/hacked,
+/obj/item/ammo_magazine/sentry/upp,
 /obj/item/defenses/handheld/sentry/upp,
 /turf/open/floor/strata{
 	icon_state = "floor2"
@@ -3476,12 +3472,8 @@
 /area/golden_arrow/hangar)
 "GT" = (
 /obj/structure/surface/rack,
-/obj/item/ammo_magazine/sentry{
-	layer = 3.01;
-	name = "AK-500 ammo drum (7,62mm Caseless)";
-	desc = "An ammo drum of 500 7,62mm caseless rounds for the UPPA 32-H Sentry Gun. Just feed it into the sentry gun's ammo port when its ammo is depleted."
-	},
 /obj/item/device/motiondetector/hacked,
+/obj/item/ammo_magazine/sentry/upp,
 /obj/item/defenses/handheld/sentry/upp,
 /turf/open/floor/strata{
 	icon_state = "floor2"