diff --git a/config/ai/nk2ai/nk2ai-settings.json b/config/ai/nk2ai/nk2ai-settings.json
index a0a99bc18..5cca1086d 100644
--- a/config/ai/nk2ai/nk2ai-settings.json
+++ b/config/ai/nk2ai/nk2ai-settings.json
@@ -4,7 +4,7 @@
 	"pawn" : {
 		"maxRoamingHeroes" : 3, //H3 value: 3,
 		"maxRoamingHeroesPerTown" : 0,
-		"maxPass" : 7,
+		"maxPass" : 5,
 		"maxPriorityPass" : 2,
 		"mainHeroTurnDistanceLimit" : 10,
 		"scoutHeroTurnDistanceLimit" : 5,
@@ -17,8 +17,8 @@
 		"allowObjectGraph": false,
 		"pathfinderBucketsCount" : 1,
 		"pathfinderBucketSize" : 10,
-		"retreatThresholdRelative" : 0,
-		"retreatThresholdAbsolute" : 0,
+		"retreatThresholdRelative" : 0.1,
+		"retreatThresholdAbsolute" : 2000,
 		"safeAttackRatio" : 1.1,
 		"maxArmyLossTarget" : 0.65,
 		"useFuzzy" : false
@@ -28,7 +28,7 @@
 		"maxRoamingHeroes" : 2, //H3 value: 3,
 		"maxRoamingHeroesPerTown" : 1,
 		"maxPass" : 10,
-		"maxPriorityPass" : 4,
+		"maxPriorityPass" : 5,
 		"mainHeroTurnDistanceLimit" : 10,
 		"scoutHeroTurnDistanceLimit" : 5,
 		"threatTurnDistanceLimit" : 4,
@@ -62,7 +62,7 @@
 		"openMap": false,
 		"allowObjectGraph": false,
 		"pathfinderBucketsCount" : 1,
-		"pathfinderBucketSize" : 100,
+		"pathfinderBucketSize" : 30,
 		"retreatThresholdRelative" : 0.3,
 		"retreatThresholdAbsolute" : 10000,
 		"safeAttackRatio" : 1.1,
@@ -85,7 +85,7 @@
 		"openMap": true,
 		"allowObjectGraph": false,
 		"pathfinderBucketsCount" : 1,
-		"pathfinderBucketSize" : 100,
+		"pathfinderBucketSize" : 30,
 		"retreatThresholdRelative" : 0.3,
 		"retreatThresholdAbsolute" : 10000,
 		"safeAttackRatio" : 1.1,
@@ -108,7 +108,7 @@
 		"openMap": true,
 		"allowObjectGraph": false,
 		"pathfinderBucketsCount" : 1,
-		"pathfinderBucketSize" : 100,
+		"pathfinderBucketSize" : 30,
 		"retreatThresholdRelative" : 0.3,
 		"retreatThresholdAbsolute" : 10000,
 		"safeAttackRatio" : 1.1,