diff --git a/.env b/.env
index d51a806139..df58cdbdce 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-TAG=v5.0.0-rc.5
+TAG=v5.0.2
 COMPILER_TAG=v4.0.0
diff --git a/es/ae/index.js b/es/ae/index.js
index 5152116bcb..c688b64af3 100644
--- a/es/ae/index.js
+++ b/es/ae/index.js
@@ -76,7 +76,6 @@ async function spend (amount, recipientId, options = {}) {
 
 /**
  * Resolve AENS name and return name hash
- *
  * @param {String} nameOrAddress
  * @param verify
  * @return {String} Address or AENS name hash
diff --git a/es/tx/builder/helpers.js b/es/tx/builder/helpers.js
index a6402ab21c..56f54621c7 100644
--- a/es/tx/builder/helpers.js
+++ b/es/tx/builder/helpers.js
@@ -297,9 +297,9 @@ export function computeBidFee (domain, startFee = NAME_FEE, increment = NAME_FEE
 
 export function computeAuctionEndBlock (domain, claimHeight) {
   return R.cond([
-    [R.lt(4), R.always(NAME_BID_TIMEOUTS[1] + claimHeight)],
-    [R.lt(8), R.always(NAME_BID_TIMEOUTS[4] + claimHeight)],
-    [R.lte(NAME_BID_MAX_LENGTH), R.always(NAME_BID_TIMEOUTS[8] + claimHeight)],
+    [R.lt(5), R.always(NAME_BID_TIMEOUTS[4] + claimHeight)],
+    [R.lt(9), R.always(NAME_BID_TIMEOUTS[8] + claimHeight)],
+    [R.lte(NAME_BID_MAX_LENGTH), R.always(NAME_BID_TIMEOUTS[12] + claimHeight)],
     [R.T, R.always(claimHeight)]
   ])(domain.replace('.chain', '').length)
 }
diff --git a/es/tx/builder/schema.js b/es/tx/builder/schema.js
index 92d1f76110..42354c9494 100644
--- a/es/tx/builder/schema.js
+++ b/es/tx/builder/schema.js
@@ -72,9 +72,9 @@ export const NAME_BID_RANGES = {
 // # name bid timeouts
 export const NAME_BID_TIMEOUTS = {
   13: 0,
-  8: NAME_BID_TIMEOUT_BLOCKS, // # 480 blocks
-  4: 31 * NAME_BID_TIMEOUT_BLOCKS, // # 14880 blocks
-  1: 62 * NAME_BID_TIMEOUT_BLOCKS // # 29760 blocks
+  12: NAME_BID_TIMEOUT_BLOCKS, // # 480 blocks
+  8: 31 * NAME_BID_TIMEOUT_BLOCKS, // # 14880 blocks
+  4: 62 * NAME_BID_TIMEOUT_BLOCKS // # 29760 blocks
 }
 
 // # Tag constant for ids (type uint8)