diff --git a/scripts-piglit/shiptemplates/player.lua b/scripts-piglit/shiptemplates/player.lua
index 966b5cb959..b7782b7e4a 100644
--- a/scripts-piglit/shiptemplates/player.lua
+++ b/scripts-piglit/shiptemplates/player.lua
@@ -533,32 +533,34 @@ template:setRepairCrewCount(4)
 addSystemsAtlas(template)
 
 --[[Carrier Corvette--]]
---template = ShipTemplate():setName("Poseidon"):setClass(_("class", "Corvette"), _("subclass", "Combat Carrier")):setModel("AtlasCarrierDreadnought"..color_player):setType("playership")
---template:setDescription([[The Poseidon armed combat carrier combines the durability of a corvette class ship with the ability to launch fighters and bombers. It has weapons to defend itself and the fighters, however there are no heavy weapons in the arsenal.]])
---template:setRadarTrace("melon.png")
---[[
+template = ShipTemplate():setName("Poseidon"):setClass(_("class", "Corvette"), _("subclass", "Combat Carrier")):setModel("AtlasCarrierDreadnought"..color_player):setType("playership")
+template:setDescription([[The Poseidon armed combat carrier combines the durability of a corvette class ship with the ability to launch fighters and bombers. It has weapons to defend itself and the fighters, however there are no heavy weapons in the arsenal.]])
+template:setRadarTrace("melon.png")
 template:setJumpDrive(true)
 template:setWarpSpeed(750)
 template:setWarpDrive(false)
-template:setShields(200, 200)
-template:setHull(250)
+template:setShields(100, 100)
+template:setHull(200)
 template:setSpeed(90, 8, 10)
 template:setCombatManeuver(400, 250)
 --                  Arc, Dir, Range, CycleTime, Dmg
-template:setBeam(0,100, -20, 1500.0, 6.0, 8)
-template:setBeam(1,100,  20, 1500.0, 6.0, 8)
+template:setBeam(0, 10,   0, 1500.0, 6.0, 4)
+template:setBeam(1, 10, 180, 1500.0, 6.0, 4)
+--								 Arc, Dir, Rotate speed
+template:setBeamWeaponTurret( 0, 90,   0, 6)
+template:setBeamWeaponTurret( 1, 90, 180, 6)
 template:setWeaponStorage("Homing", 12)
 template:setWeaponStorage("Nuke", 0)
-template:setWeaponStorage("Mine", 4)
-template:setWeaponStorage("EMP", 0)
-template:setWeaponStorage("HVLI", 10)
+template:setWeaponStorage("Mine", 2)
+template:setWeaponStorage("EMP", 6)
+template:setWeaponStorage("HVLI", 0)
 template:setTubes(3, 8.0) -- Amount of torpedo tubes, and loading time of the tubes.
 template:weaponTubeDisallowMissle(0, "Mine")
 template:weaponTubeDisallowMissle(1, "Mine")
 template:setTubeDirection(0, -90)
 template:setTubeDirection(1,  90)
 template:setTubeDirection(2, 180):setWeaponTubeExclusiveFor(2, "Mine")
-template:setInternalDockClasses(_("subclass", "Interceptor"), _("subclass", "Bomber"), _("subclass", "Rocket Fighter"), _("subclass", "Scout"))	-- do not allow heavy bombers
+template:setInternalDockClasses(_("class", "Starfighter"))
 template:setSpawnShips("MP52 Hornet", "ZX-Lindworm")
 
 template:setRestocksMissilesDocked("all")
@@ -566,7 +568,9 @@ template:setSharesEnergyWithDocked(true)
 template:setRestocksScanProbes(true)
 template:setRepairDocked(true)
 addSystemsAtlasAlt(template)
---]]
+
+template:setShortRangeRadarRange(15000)
+
 --[[Heavy Carrier Corvette--]]
 --template = ShipTemplate():setName("Neptune"):setClass(_("class", "Corvette"), _("subclass", "Heavy Carrier")):setType("playership")
 --template:setModel("HeavyDreadnoughtGrey")