diff --git a/units/armcom.lua b/units/armcom.lua
index 5b58d7ef1..9b2f46652 100644
--- a/units/armcom.lua
+++ b/units/armcom.lua
@@ -6,7 +6,7 @@ return {
 		autoheal = 5,
 		brakerate = 1.125,
 		buildcostenergy = 15000,
-		buildcostmetal = 1500,
+		buildcostmetal = 2000,
 		builddistance = 132,
 		builder = true,
 		buildpic = "ARMCOM.png",
diff --git a/units/armcom1.lua b/units/armcom1.lua
index 21153dc0b..bf1df13f9 100644
--- a/units/armcom1.lua
+++ b/units/armcom1.lua
@@ -31,7 +31,7 @@ return {
 		decoyfor = "armcom",
 		defaultmissiontype = "Standby",
 		description = "Commander",
-		energymake = 100,
+		energymake = 250,
 		energystorage = 5000,
 		energyuse = 0,
 		explodeas = "COMMANDER_BLAST1",
@@ -50,7 +50,7 @@ return {
 		maxslope = 20,
 		maxvelocity = 1.3,
 		maxwaterdepth = 35,
-		metalmake = 4.1,
+		metalmake = 5,
 		metalstorage = 5000,
 		mincloakdistance = 50,
 		mobilestandorders = 1,
diff --git a/units/armcom4.lua b/units/armcom4.lua
index 4531b7650..0dd24e4e9 100644
--- a/units/armcom4.lua
+++ b/units/armcom4.lua
@@ -6,7 +6,7 @@ return {
 		autoheal = 9,
 		brakerate = 1.17,
 		buildcostenergy = 27000,
-		buildcostmetal = 2750,
+		buildcostmetal = 3250,
 		builddistance = 152,
 		builder = true,
 		buildpic = "ARMCOM.png",
diff --git a/units/armcom5.lua b/units/armcom5.lua
index 71f2b91ed..581be309c 100644
--- a/units/armcom5.lua
+++ b/units/armcom5.lua
@@ -50,7 +50,7 @@ return {
 		maxslope = 29,
 		maxvelocity = 1.7,
 		maxwaterdepth = 35,
-		metalmake = 12,
+		metalmake = 10,
 		metalstorage = 5000,
 		mincloakdistance = 40,
 		mobilestandorders = 1,
diff --git a/units/corcom.lua b/units/corcom.lua
index 11cfdc05c..36691b750 100644
--- a/units/corcom.lua
+++ b/units/corcom.lua
@@ -6,7 +6,7 @@ return {
 		autoheal = 5,
 		brakerate = 1.125,
 		buildcostenergy = 15000,
-		buildcostmetal = 1500,
+		buildcostmetal = 2000,
 		builddistance = 132,
 		builder = true,
 		buildpic = "CORCOM.png",
diff --git a/units/corcom1.lua b/units/corcom1.lua
index 32615231f..fdd9d43a7 100644
--- a/units/corcom1.lua
+++ b/units/corcom1.lua
@@ -31,7 +31,7 @@ return {
 		decoyfor = "corcom",
 		defaultmissiontype = "Standby",
 		description = "Commander",
-		energymake = 100,
+		energymake = 250,
 		energystorage = 5000,
 		energyuse = 0,
 		explodeas = "COMMANDER_BLAST1",
@@ -50,7 +50,7 @@ return {
 		maxslope = 20,
 		maxvelocity = 1.3,
 		maxwaterdepth = 35,
-		metalmake = 4.1,
+		metalmake = 5,
 		metalstorage = 5000,
 		mincloakdistance = 50,
 		mobilestandorders = 1,
diff --git a/units/corcom3.lua b/units/corcom3.lua
index ab09efaf5..db515d177 100644
--- a/units/corcom3.lua
+++ b/units/corcom3.lua
@@ -6,7 +6,7 @@ return {
 		autoheal = 8,
 		brakerate = 1.155,
 		buildcostenergy = 27000,
-		buildcostmetal = 2750,
+		buildcostmetal = 3250,
 		builddistance = 147,
 		builder = true,
 		buildpic = "CORCOM.png",
diff --git a/units/corcom5.lua b/units/corcom5.lua
index 87840df6e..12a4b809c 100644
--- a/units/corcom5.lua
+++ b/units/corcom5.lua
@@ -50,7 +50,7 @@ return {
 		maxslope = 29,
 		maxvelocity = 1.7,
 		maxwaterdepth = 35,
-		metalmake = 12,
+		metalmake = 10,
 		metalstorage = 5000,
 		mincloakdistance = 40,
 		mobilestandorders = 1,
diff --git a/units/tllcom.lua b/units/tllcom.lua
index d0b2775c6..dc068d800 100644
--- a/units/tllcom.lua
+++ b/units/tllcom.lua
@@ -6,7 +6,7 @@ return {
 		autoheal = 11,
 		brakerate = 1.125,
 		buildcostenergy = 15000,
-		buildcostmetal = 1500,
+		buildcostmetal = 2000,
 		builddistance = 132,
 		builder = true,
 		buildpic = "TLLCOM.png",
@@ -30,7 +30,7 @@ return {
 		corpse = "DEAD",
 		defaultmissiontype = "Standby",
 		description = "Commander",
-		energymake = 30,
+		energymake = 15,
 		energystorage = 1000,
 		energyuse = 0,
 		explodeas = "COMMANDER_BLAST1",
diff --git a/units/tllcom1.lua b/units/tllcom1.lua
index e1a20eeee..29deddb49 100644
--- a/units/tllcom1.lua
+++ b/units/tllcom1.lua
@@ -49,7 +49,7 @@ return {
 		maxslope = 20,
 		maxvelocity = 1.1,
 		maxwaterdepth = 35,
-		metalmake = 6,
+		metalmake = 7.5,
 		metalstorage = 5000,
 		mincloakdistance = 50,
 		mobilestandorders = 1,
diff --git a/units/tllcom3.lua b/units/tllcom3.lua
index e0f0d9806..940a02145 100644
--- a/units/tllcom3.lua
+++ b/units/tllcom3.lua
@@ -6,7 +6,7 @@ return {
 		autoheal = 9,
 		brakerate = 1.17,
 		buildcostenergy = 27000,
-		buildcostmetal = 2750,
+		buildcostmetal = 3250,
 		builddistance = 152,
 		builder = true,
 		buildpic = "tllcom.png",
diff --git a/units/tllcom5.lua b/units/tllcom5.lua
index 812fc5f0d..2b140d545 100644
--- a/units/tllcom5.lua
+++ b/units/tllcom5.lua
@@ -50,7 +50,7 @@ return {
 		maxslope = 29,
 		maxvelocity = 1.7,
 		maxwaterdepth = 35,
-		metalmake = 12,
+		metalmake = 10,
 		metalstorage = 5000,
 		mincloakdistance = 40,
 		mobilestandorders = 1,