diff --git a/blockchains/tezos/validators/list.json b/blockchains/tezos/validators/list.json
index 3ffc83776..5316db37f 100644
--- a/blockchains/tezos/validators/list.json
+++ b/blockchains/tezos/validators/list.json
@@ -10,7 +10,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 5159,
+            "freeSpace": 5193,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -26,7 +26,7 @@
             "payoutPeriod": 5
         },
         "staking": {
-            "freeSpace": 2613688,
+            "freeSpace": 2614169,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -42,7 +42,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 74790,
+            "freeSpace": 74974,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -58,7 +58,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 3447653,
+            "freeSpace": 3449275,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -74,7 +74,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 4400325,
+            "freeSpace": 4433250,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -90,7 +90,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 9076309,
+            "freeSpace": 9078699,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -106,7 +106,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 2835369,
+            "freeSpace": 2836509,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -122,7 +122,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 3228750,
+            "freeSpace": 3227659,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -142,7 +142,7 @@
             "note:": "Minimum delegation 1000 XTZ"
         },
         "staking": {
-            "freeSpace": 433769,
+            "freeSpace": 434078,
             "minDelegation": 1000,
             "openForDelegation": true
         }
@@ -158,7 +158,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 1682442,
+            "freeSpace": 1682995,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -174,7 +174,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 81320,
+            "freeSpace": 81391,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -190,7 +190,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 164010,
+            "freeSpace": 165305,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -206,7 +206,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 125559,
+            "freeSpace": 125637,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -222,7 +222,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 1544705,
+            "freeSpace": 1541998,
             "minDelegation": 10,
             "openForDelegation": true
         }
@@ -238,7 +238,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 619132,
+            "freeSpace": 622686,
             "minDelegation": 10,
             "openForDelegation": true
         }
@@ -254,7 +254,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 276934,
+            "freeSpace": 277376,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -270,7 +270,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 834513,
+            "freeSpace": 834634,
             "minDelegation": 10,
             "openForDelegation": true
         }
@@ -286,7 +286,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 3517574,
+            "freeSpace": 3522533,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -302,7 +302,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 143939,
+            "freeSpace": 145535,
             "minDelegation": 100,
             "openForDelegation": true
         }
@@ -318,7 +318,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 49754,
+            "freeSpace": 49784,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -334,7 +334,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 687821,
+            "freeSpace": 687858,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -350,7 +350,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 8116,
+            "freeSpace": 8135,
             "minDelegation": 1,
             "openForDelegation": true
         }
@@ -366,7 +366,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 410198,
+            "freeSpace": 407343,
             "minDelegation": 10,
             "openForDelegation": true
         }
@@ -382,7 +382,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 18666,
+            "freeSpace": 18685,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -398,7 +398,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 409930,
+            "freeSpace": 409366,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -414,7 +414,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 3438200,
+            "freeSpace": 3439835,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -430,7 +430,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 1848753,
+            "freeSpace": 1850279,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -446,7 +446,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 359496,
+            "freeSpace": 359574,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -462,7 +462,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 85977,
+            "freeSpace": 86015,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -478,7 +478,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 334417,
+            "freeSpace": 334574,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -494,7 +494,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 29355,
+            "freeSpace": 29314,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -514,7 +514,7 @@
             "note:": "Outdated"
         },
         "staking": {
-            "freeSpace": 180253,
+            "freeSpace": 180299,
             "minDelegation": 0,
             "openForDelegation": true
         }
@@ -530,7 +530,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 166274,
+            "freeSpace": 166540,
             "minDelegation": 10,
             "openForDelegation": true
         }
@@ -546,7 +546,7 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": 111228,
+            "freeSpace": 111255,
             "minDelegation": 100,
             "openForDelegation": true
         }
@@ -562,9 +562,13 @@
             "payoutPeriod": 1
         },
         "staking": {
-            "freeSpace": -52287,
+            "freeSpace": -53670,
             "minDelegation": 10,
             "openForDelegation": true
+        },
+        "status": {
+            "disabled": true,
+            "note": "No more capacity"
         }
     }
 ]
\ No newline at end of file
diff --git a/script/gen_validators_tezos.ts b/script/gen_validators_tezos.ts
index 7d6016c69..c40d81565 100644
--- a/script/gen_validators_tezos.ts
+++ b/script/gen_validators_tezos.ts
@@ -25,8 +25,17 @@ import { BakingBadBaker } from "../src/test/models";
         val.payout.payoutDelay = bakerInfo.payoutDelay
         val.payout.payoutPeriod = bakerInfo.payoutPeriod
 
+        const freeSpace =  Number((bakerInfo.freeSpace).toFixed(0))
+        // Give baker status false if no more capacity
+        if (freeSpace <= 0) {
+            val.status = {
+                "disabled": true,
+                "note": "No more capacity"
+            }
+        }
+
         val["staking"] = {
-            freeSpace:Number((bakerInfo.freeSpace).toFixed(0)),
+            freeSpace: freeSpace,
             minDelegation: bakerInfo.minDelegation,
             openForDelegation: bakerInfo.openForDelegation
         }
diff --git a/src/test/models.ts b/src/test/models.ts
index 3071d7dbc..69a47cdae 100644
--- a/src/test/models.ts
+++ b/src/test/models.ts
@@ -5,6 +5,7 @@ export interface ValidatorModel {
     website: string,
     staking: Staking
     payout: Payout
+    status: ValidatorStatus
 }
 
 interface Staking {
@@ -19,6 +20,11 @@ interface Payout {
   payoutPeriod: number
 }
 
+interface ValidatorStatus {
+  disabled: boolean;
+  note: string;
+}
+
 // Minimal property requirements for asset info file
 export interface AssetInfo {
     explorer: string;