diff --git a/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
index d869c96d31..fa4c980b8d 100644
--- a/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
+++ b/Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs
@@ -13,5 +13,5 @@ public sealed partial class SprayPainterAmmoComponent : Component
     /// The value by which the charge in the spray painter will be recharged.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public int Charges = 15;
+    public int Charges = 30;
 }
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index 76d7ccbfb1..5b816f16c1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -47,8 +47,8 @@
   - type: StaticPrice
     price: 40
   - type: LimitedCharges
-    maxCharges: 15
-    lastCharges: 15
+    maxCharges: 30
+    lastCharges: 30
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -94,7 +94,7 @@
     heldPrefix: ammo
   - type: PhysicalComposition
     materialComposition:
-      Steel: 10
-      Plastic: 10
+      Steel: 20
+      Plastic: 20
   - type: StaticPrice
     price: 30