diff --git a/lerna.json b/lerna.json
index 2a9439d49715..5362d02551d8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useNx": true,
-  "version": "1.15.0",
+  "version": "1.15.1",
   "stream": true,
   "command": {
     "version": {
diff --git a/packages/api/package.json b/packages/api/package.json
index 533961953b9a..e9fa0936c3f8 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -71,10 +71,10 @@
   "dependencies": {
     "@chainsafe/persistent-merkle-tree": "^0.6.1",
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "eventsource": "^2.0.2",
     "qs": "^6.11.1"
   },
diff --git a/packages/beacon-node/package.json b/packages/beacon-node/package.json
index 8ce625fb0d54..e2366bb86051 100644
--- a/packages/beacon-node/package.json
+++ b/packages/beacon-node/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -121,18 +121,18 @@
     "@libp2p/peer-id-factory": "^4.0.3",
     "@libp2p/prometheus-metrics": "^3.0.10",
     "@libp2p/tcp": "9.0.10",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/db": "^1.15.0",
-    "@lodestar/fork-choice": "^1.15.0",
-    "@lodestar/light-client": "^1.15.0",
-    "@lodestar/logger": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/reqresp": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
-    "@lodestar/validator": "^1.15.0",
+    "@lodestar/api": "^1.15.1",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/db": "^1.15.1",
+    "@lodestar/fork-choice": "^1.15.1",
+    "@lodestar/light-client": "^1.15.1",
+    "@lodestar/logger": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/reqresp": "^1.15.1",
+    "@lodestar/state-transition": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
+    "@lodestar/validator": "^1.15.1",
     "@multiformats/multiaddr": "^12.1.3",
     "@types/datastore-level": "^3.0.0",
     "buffer-xor": "^2.0.2",
diff --git a/packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts b/packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts
index 5dbe104c9541..91242d879f85 100644
--- a/packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts
+++ b/packages/beacon-node/src/chain/blocks/verifyBlocksExecutionPayloads.ts
@@ -319,7 +319,7 @@ export async function verifyBlockExecutionPayload(
       const lvhResponse = {
         executionStatus,
         latestValidExecHash: execResult.latestValidHash,
-        invalidateFromBlockHash: toHexString(block.message.parentRoot),
+        invalidateFromParentBlockRoot: toHexString(block.message.parentRoot),
       };
       const execError = new BlockError(block, {
         code: BlockErrorCode.EXECUTION_ENGINE_ERROR,
@@ -416,7 +416,7 @@ function getSegmentErrorResponse(
       invalidSegmentLVH = {
         executionStatus: ExecutionStatus.Invalid,
         latestValidExecHash: lvhResponse.latestValidExecHash,
-        invalidateFromBlockHash: parentBlock.blockRoot,
+        invalidateFromParentBlockRoot: parentBlock.blockRoot,
       };
     }
   }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 616dce9d4f68..839d42c7b3d6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -66,19 +66,18 @@
     "@libp2p/crypto": "^3.0.4",
     "@libp2p/peer-id": "^4.0.4",
     "@libp2p/peer-id-factory": "^4.0.3",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/beacon-node": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/db": "^1.15.0",
-    "@lodestar/light-client": "^1.15.0",
-    "@lodestar/logger": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
-    "@lodestar/validator": "^1.15.0",
+    "@lodestar/api": "^1.15.1",
+    "@lodestar/beacon-node": "^1.15.1",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/db": "^1.15.1",
+    "@lodestar/light-client": "^1.15.1",
+    "@lodestar/logger": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/state-transition": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
+    "@lodestar/validator": "^1.15.1",
     "@multiformats/multiaddr": "^12.1.3",
-    "@types/lockfile": "^1.0.2",
     "bip39": "^3.1.0",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
@@ -87,9 +86,9 @@
     "got": "^11.8.6",
     "inquirer": "^9.1.5",
     "js-yaml": "^4.1.0",
-    "lockfile": "^1.0.4",
     "lodash": "^4.17.21",
     "prom-client": "^15.1.0",
+    "proper-lockfile": "^4.1.2",
     "rimraf": "^4.4.1",
     "source-map-support": "^0.5.21",
     "uint8arrays": "^4.0.9",
@@ -97,12 +96,13 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
-    "@lodestar/test-utils": "^1.15.0",
+    "@lodestar/test-utils": "^1.15.1",
     "@types/debug": "^4.1.7",
     "@types/expand-tilde": "^2.0.0",
     "@types/got": "^9.6.12",
     "@types/inquirer": "^9.0.3",
     "@types/lodash": "^4.14.192",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/yargs": "^17.0.24"
   }
 }
diff --git a/packages/cli/src/cmds/validator/options.ts b/packages/cli/src/cmds/validator/options.ts
index ecc8ad32ca87..6d8d40f2dfdb 100644
--- a/packages/cli/src/cmds/validator/options.ts
+++ b/packages/cli/src/cmds/validator/options.ts
@@ -267,7 +267,7 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
   },
 
   blindedLocal: {
-    type: "string",
+    type: "boolean",
     description: "Request fetching local block in blinded format for produceBlockV3",
     defaultDescription: `${defaultOptions.blindedLocal}`,
   },
diff --git a/packages/cli/src/util/lockfile.ts b/packages/cli/src/util/lockfile.ts
index 65933e8f2897..f7a6ddf4d57d 100644
--- a/packages/cli/src/util/lockfile.ts
+++ b/packages/cli/src/util/lockfile.ts
@@ -1,29 +1,21 @@
-export type Lockfile = {
-  lockSync(path: string): void;
-  unlockSync(path: string): void;
-};
-
-const lockFile: Lockfile = (await import("lockfile")) as Lockfile;
-
-function getLockFilepath(filepath: string): string {
-  return `${filepath}.lock`;
-}
-
-/**
- * When lockfile is imported, it registers listeners to process
- * Since it's only used by the validator client, require lazily to not pollute
- * beacon_node client context
- */
-function getLockFile(): Lockfile {
-  return lockFile;
-}
+import {lockSync, unlockSync} from "proper-lockfile";
 
 /**
  * Creates a .lock file for `filepath`, argument passed must not be the lock path
  * @param filepath File to lock, i.e. `keystore_0001.json`
  */
 export function lockFilepath(filepath: string): void {
-  getLockFile().lockSync(getLockFilepath(filepath));
+  try {
+    lockSync(filepath, {
+      // Allows to lock files that do not exist
+      realpath: false,
+    });
+  } catch (e) {
+    if (isLockfileError(e) && e.code === "ELOCKED") {
+      e.message = `${filepath} is already in use by another process`;
+    }
+    throw e;
+  }
 }
 
 /**
@@ -31,7 +23,23 @@ export function lockFilepath(filepath: string): void {
  * @param filepath File to unlock, i.e. `keystore_0001.json`
  */
 export function unlockFilepath(filepath: string): void {
-  // Does not throw if the lock file is already deleted
-  // https://github.com/npm/lockfile/blob/6590779867ee9bdc5dbebddc962640759892bb91/lockfile.js#L68
-  getLockFile().unlockSync(getLockFilepath(filepath));
+  try {
+    unlockSync(filepath, {
+      // Allows to unlock files that do not exist
+      realpath: false,
+    });
+  } catch (e) {
+    if (isLockfileError(e) && e.code === "ENOTACQUIRED") {
+      // Do not throw if the lock file is already deleted
+      return;
+    }
+    throw e;
+  }
+}
+
+// https://github.com/moxystudio/node-proper-lockfile/blob/9f8c303c91998e8404a911dc11c54029812bca69/lib/lockfile.js#L53
+export type LockfileError = Error & {code: "ELOCKED" | "ENOTACQUIRED"};
+
+function isLockfileError(e: unknown): e is LockfileError {
+  return e instanceof Error && (e as LockfileError).code !== undefined;
 }
diff --git a/packages/cli/test/e2e/importKeystoresFromApi.test.ts b/packages/cli/test/e2e/importKeystoresFromApi.test.ts
index bb91d467b86a..1cf5f107e226 100644
--- a/packages/cli/test/e2e/importKeystoresFromApi.test.ts
+++ b/packages/cli/test/e2e/importKeystoresFromApi.test.ts
@@ -95,10 +95,10 @@ describe("import keystores from api", function () {
       validator.on("exit", (code) => {
         if (code !== null && code > 0) {
           // process should exit with code > 0, and an error related to locks. Sample error:
-          // vc 351591:  ✖ Error: EEXIST: file already exists, open '/tmp/tmp-351554-dMctEAj7sJIz/import-keystores-test/keystores/0x8be678633e927aa0435addad5dcd5283fef6110d91362519cd6d43e61f6c017d724fa579cc4b2972134e050b6ba120c0/voting-keystore.json.lock'
-          // at Object.openSync (node:fs:585:3)
-          // at Module.exports.lockSync (/home/lion/Code/eth2.0/lodestar/node_modules/lockfile/lockfile.js:277:17)
-          if (/EEXIST.*voting-keystore\.json\.lock/.test(vcProc2Stderr.read())) {
+          // vc 351591:  ✖ Error: /tmp/tmp-5080-lwNxdM5Ok9ya/import-keystores-test/keystores/0x8be678633e927aa0435addad5dcd5283fef6110d91362519cd6d43e61f6c017d724fa579cc4b2972134e050b6ba120c0/voting-keystore.json is already in use by another process
+          // at /home/runner/actions-runner/_work/lodestar/lodestar/node_modules/proper-lockfile/lib/lockfile.js:68:47
+          // ... more stack trace
+          if (/Error.*voting-keystore\.json is already in use by another process/.test(vcProc2Stderr.read())) {
             resolve();
           } else {
             reject(Error(`Second validator proc exited with unknown error. stderr:\n${vcProc2Stderr.read()}`));
diff --git a/packages/cli/test/unit/validator/decryptKeystoreDefinitions.test.ts b/packages/cli/test/unit/validator/decryptKeystoreDefinitions.test.ts
index f24b83ae43a6..0f4173604405 100644
--- a/packages/cli/test/unit/validator/decryptKeystoreDefinitions.test.ts
+++ b/packages/cli/test/unit/validator/decryptKeystoreDefinitions.test.ts
@@ -7,6 +7,7 @@ import {cachedSeckeysHex} from "../../utils/cachedKeys.js";
 import {testFilesDir} from "../../utils.js";
 import {decryptKeystoreDefinitions} from "../../../src/cmds/validator/keymanager/decryptKeystoreDefinitions.js";
 import {LocalKeystoreDefinition} from "../../../src/cmds/validator/keymanager/interface.js";
+import {LockfileError, unlockFilepath} from "../../../src/util/lockfile.js";
 
 describe("decryptKeystoreDefinitions", () => {
   vi.setConfig({testTimeout: 100_000});
@@ -22,6 +23,10 @@ describe("decryptKeystoreDefinitions", () => {
   let definitions: LocalKeystoreDefinition[] = [];
 
   beforeEach(async () => {
+    // remove lockfiles from proper-lockfile cache
+    for (const {keystorePath} of definitions) {
+      unlockFilepath(keystorePath);
+    }
     rimraf.sync(dataDir);
     rimraf.sync(importFromDir);
 
@@ -46,7 +51,9 @@ describe("decryptKeystoreDefinitions", () => {
       expect(fs.existsSync(cacheFilePath)).toBe(true);
 
       // remove lockfiles created during cache file preparation
-      rimraf.sync(path.join(importFromDir, "*.lock"), {glob: true});
+      for (const {keystorePath} of definitions) {
+        unlockFilepath(keystorePath);
+      }
     });
 
     testDecryptKeystoreDefinitions(cacheFilePath);
@@ -75,14 +82,14 @@ describe("decryptKeystoreDefinitions", () => {
         await decryptKeystoreDefinitions(definitions, {logger: console, signal, cacheFilePath});
         expect.fail("Second decrypt should fail due to failure to get lockfile");
       } catch (e) {
-        expect((e as Error).message.startsWith("EEXIST: file already exists")).toBe(true);
+        expect((e as LockfileError).code).toBe<LockfileError["code"]>("ELOCKED");
       }
     });
 
     it("decrypt keystores if lockfiles already exist if ignoreLockFile=true", async () => {
       await decryptKeystoreDefinitions(definitions, {logger: console, signal, cacheFilePath});
-
       // lockfiles should exist after the first run
+
       await decryptKeystoreDefinitions(definitions, {logger: console, signal, cacheFilePath, ignoreLockFile: true});
     });
   }
diff --git a/packages/config/package.json b/packages/config/package.json
index a36da8c6240a..0f47077b7ea5 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/config",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Chain configuration required for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -65,7 +65,7 @@
   ],
   "dependencies": {
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/types": "^1.15.0"
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/types": "^1.15.1"
   }
 }
diff --git a/packages/db/package.json b/packages/db/package.json
index f11e5b48995c..7de4789864a3 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/db",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "DB modules of Lodestar",
   "author": "ChainSafe Systems",
   "homepage": "https://github.com/ChainSafe/lodestar#readme",
@@ -38,13 +38,13 @@
   },
   "dependencies": {
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "@types/levelup": "^4.3.3",
     "it-all": "^3.0.4",
     "level": "^8.0.0"
   },
   "devDependencies": {
-    "@lodestar/logger": "^1.15.0"
+    "@lodestar/logger": "^1.15.1"
   }
 }
diff --git a/packages/db/src/controller/level.ts b/packages/db/src/controller/level.ts
index 3eed75958e3e..2cea8681c95b 100644
--- a/packages/db/src/controller/level.ts
+++ b/packages/db/src/controller/level.ts
@@ -52,7 +52,7 @@ export class LevelDbController implements DatabaseController<Uint8Array, Uint8Ar
       await db.open();
     } catch (e) {
       if ((e as LevelDbError).cause?.code === "LEVEL_LOCKED") {
-        throw new Error("Database is already in use by another Lodestar instance");
+        throw new Error("Database is already in use by another process");
       }
       throw e;
     }
diff --git a/packages/flare/package.json b/packages/flare/package.json
index 93973110ab8a..afb4829a24e7 100644
--- a/packages/flare/package.json
+++ b/packages/flare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/flare",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Beacon chain debugging tool",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -60,12 +60,12 @@
   "dependencies": {
     "@chainsafe/bls": "7.1.1",
     "@chainsafe/bls-keygen": "^0.3.0",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/api": "^1.15.1",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/state-transition": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "source-map-support": "^0.5.21",
     "yargs": "^17.7.1"
   },
diff --git a/packages/fork-choice/package.json b/packages/fork-choice/package.json
index 606dec811bbc..7c3e9ae8eb38 100644
--- a/packages/fork-choice/package.json
+++ b/packages/fork-choice/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -39,11 +39,11 @@
   },
   "dependencies": {
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0"
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/state-transition": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1"
   },
   "keywords": [
     "ethereum",
diff --git a/packages/fork-choice/src/protoArray/interface.ts b/packages/fork-choice/src/protoArray/interface.ts
index 1910ad2b4206..003a3c8f9f1e 100644
--- a/packages/fork-choice/src/protoArray/interface.ts
+++ b/packages/fork-choice/src/protoArray/interface.ts
@@ -29,7 +29,7 @@ export type LVHValidResponse = {
 export type LVHInvalidResponse = {
   executionStatus: ExecutionStatus.Invalid;
   latestValidExecHash: RootHex | null;
-  invalidateFromBlockHash: RootHex;
+  invalidateFromParentBlockRoot: RootHex;
 };
 export type LVHExecResponse = LVHValidResponse | LVHInvalidResponse;
 
diff --git a/packages/fork-choice/src/protoArray/protoArray.ts b/packages/fork-choice/src/protoArray/protoArray.ts
index 62f50b03771c..eaa86b2f0ee1 100644
--- a/packages/fork-choice/src/protoArray/protoArray.ts
+++ b/packages/fork-choice/src/protoArray/protoArray.ts
@@ -279,32 +279,33 @@ export class ProtoArray {
       // Mark chain ii) as Invalid if LVH is found and non null, else only invalidate invalid_payload
       // if its in fcU.
       //
-      const {invalidateFromBlockHash, latestValidExecHash} = execResponse;
-      const invalidateFromIndex = this.indices.get(invalidateFromBlockHash);
-      if (invalidateFromIndex === undefined) {
-        throw Error(`Unable to find invalidateFromBlockHash=${invalidateFromBlockHash} in forkChoice`);
+      const {invalidateFromParentBlockRoot, latestValidExecHash} = execResponse;
+      const invalidateFromParentIndex = this.indices.get(invalidateFromParentBlockRoot);
+      if (invalidateFromParentIndex === undefined) {
+        throw Error(`Unable to find invalidateFromParentBlockRoot=${invalidateFromParentBlockRoot} in forkChoice`);
       }
       const latestValidHashIndex =
-        latestValidExecHash !== null ? this.getNodeIndexFromLVH(latestValidExecHash, invalidateFromIndex) : null;
+        latestValidExecHash !== null ? this.getNodeIndexFromLVH(latestValidExecHash, invalidateFromParentIndex) : null;
       if (latestValidHashIndex === null) {
         /**
-         *  If the LVH is null or not found, represented with latestValidHashIndex=undefined,
-         *   then just invalidate the invalid_payload and bug out.
+         * The LVH (latest valid hash) is null or not found.
          *
-         *   Ideally in not found scenario we should invalidate the entire chain upwards, but
-         *   it is possible (and observed in the testnets) that the EL was
+         * The spec gives an allowance for the EL being able to return a nullish LVH if it could not
+         * "determine" one. There are two interpretations:
          *
-         *     i) buggy: that the LVH was not really the parent of the invalid block, but on
-         *        some side chain
-         *     ii) lazy: that invalidation was result of simple check and the EL just
-         *         responded with a bogus LVH
+         * - "the LVH is unknown" - simply throw and move on. We can't determine which chain to invalidate
+         *   since we don't know which ancestor is valid.
          *
-         *   So we will just invalidate the current payload and let future responses take care
-         *   to be as robust as possible.
+         * - "the LVH doesn't exist" - this means that the entire ancestor chain is invalid, and should
+         *   be marked as such.
+         *
+         * The more robust approach is to treat nullish LVH as "the LVH is unknown" rather than
+         * "the LVH doesn't exist". The alternative means that we will poison a valid chain when the
+         * EL is lazy (or buggy) with its LVH response.
          */
-        this.invalidateNodeByIndex(invalidateFromIndex);
+        throw Error(`Unable to find latestValidExecHash=${latestValidExecHash} in the forkchoice`);
       } else {
-        this.propagateInValidExecutionStatusByIndex(invalidateFromIndex, latestValidHashIndex, currentSlot);
+        this.propagateInValidExecutionStatusByIndex(invalidateFromParentIndex, latestValidHashIndex, currentSlot);
       }
     }
   }
@@ -333,12 +334,12 @@ export class ProtoArray {
    */
 
   private propagateInValidExecutionStatusByIndex(
-    invalidateFromIndex: number,
+    invalidateFromParentIndex: number,
     latestValidHashIndex: number,
     currentSlot: Slot
   ): void {
-    // Pass 1: mark invalidateFromIndex and its parents invalid
-    let invalidateIndex: number | undefined = invalidateFromIndex;
+    // Pass 1: mark invalidateFromParentIndex and its parents invalid
+    let invalidateIndex: number | undefined = invalidateFromParentIndex;
     while (invalidateIndex !== undefined && invalidateIndex > latestValidHashIndex) {
       const invalidNode = this.invalidateNodeByIndex(invalidateIndex);
       invalidateIndex = invalidNode.parent;
@@ -368,8 +369,8 @@ export class ProtoArray {
     });
   }
 
-  private getNodeIndexFromLVH(latestValidExecHash: RootHex, ancestorOfIndex: number): number | null {
-    let nodeIndex = this.nodes[ancestorOfIndex].parent;
+  private getNodeIndexFromLVH(latestValidExecHash: RootHex, ancestorFromIndex: number): number | null {
+    let nodeIndex: number | undefined = ancestorFromIndex;
     while (nodeIndex !== undefined && nodeIndex >= 0) {
       const node = this.getNodeFromIndex(nodeIndex);
       if (
diff --git a/packages/fork-choice/test/unit/protoArray/executionStatusUpdates.test.ts b/packages/fork-choice/test/unit/protoArray/executionStatusUpdates.test.ts
index 94e5cd3ac9a0..e6916f24800f 100644
--- a/packages/fork-choice/test/unit/protoArray/executionStatusUpdates.test.ts
+++ b/packages/fork-choice/test/unit/protoArray/executionStatusUpdates.test.ts
@@ -149,7 +149,7 @@ describe("executionStatus / normal updates", () => {
     {
       executionStatus: ExecutionStatus.Invalid,
       latestValidExecHash: "2C",
-      invalidateFromBlockHash: "3C",
+      invalidateFromParentBlockRoot: "3C",
     },
     3
   );
@@ -212,7 +212,7 @@ describe("executionStatus / normal updates", () => {
     {
       executionStatus: ExecutionStatus.Invalid,
       latestValidExecHash: "1A",
-      invalidateFromBlockHash: "3A",
+      invalidateFromParentBlockRoot: "3A",
     },
     3
   );
@@ -259,7 +259,7 @@ describe("executionStatus / invalidate all postmerge chain", () => {
     {
       executionStatus: ExecutionStatus.Invalid,
       latestValidExecHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
-      invalidateFromBlockHash: "3B",
+      invalidateFromParentBlockRoot: "3B",
     },
     3
   );
@@ -336,7 +336,7 @@ describe("executionStatus / poision forkchoice if we invalidate previous valid",
         {
           executionStatus: ExecutionStatus.Invalid,
           latestValidExecHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
-          invalidateFromBlockHash: "3A",
+          invalidateFromParentBlockRoot: "3A",
         },
         3
       )
@@ -373,7 +373,7 @@ describe("executionStatus / poision forkchoice if we validate previous invalid",
     {
       executionStatus: ExecutionStatus.Invalid,
       latestValidExecHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
-      invalidateFromBlockHash: "3B",
+      invalidateFromParentBlockRoot: "3B",
     },
     3
   );
diff --git a/packages/light-client/package.json b/packages/light-client/package.json
index 456600cbd0bc..73fad280129c 100644
--- a/packages/light-client/package.json
+++ b/packages/light-client/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -70,12 +70,12 @@
     "@chainsafe/bls": "7.1.1",
     "@chainsafe/persistent-merkle-tree": "^0.6.1",
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/api": "^1.15.1",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/state-transition": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "mitt": "^3.0.0",
     "strict-event-emitter-types": "^2.0.0"
   },
diff --git a/packages/logger/package.json b/packages/logger/package.json
index f1a5ddad1a06..ea649cffb958 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -66,14 +66,14 @@
   },
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/utils": "^1.15.1",
     "winston": "^3.8.2",
     "winston-daily-rotate-file": "^4.7.1",
     "winston-transport": "^4.5.0"
   },
   "devDependencies": {
     "@chainsafe/threads": "^1.11.1",
-    "@lodestar/test-utils": "^1.15.0",
+    "@lodestar/test-utils": "^1.15.1",
     "@types/triple-beam": "^1.3.2",
     "rimraf": "^4.4.1",
     "triple-beam": "^1.3.0"
diff --git a/packages/params/package.json b/packages/params/package.json
index d41dae06816e..d94090b3f6ea 100644
--- a/packages/params/package.json
+++ b/packages/params/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/params",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Chain parameters required for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
diff --git a/packages/prover/package.json b/packages/prover/package.json
index 600f4b4d4d75..7ca0090b58aa 100644
--- a/packages/prover/package.json
+++ b/packages/prover/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -72,13 +72,13 @@
     "@ethereumjs/tx": "^4.1.2",
     "@ethereumjs/util": "^8.0.6",
     "@ethereumjs/vm": "^6.4.2",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/light-client": "^1.15.0",
-    "@lodestar/logger": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/api": "^1.15.1",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/light-client": "^1.15.1",
+    "@lodestar/logger": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "ethereum-cryptography": "^1.2.0",
     "find-up": "^6.3.0",
     "http-proxy": "^1.18.1",
@@ -87,7 +87,7 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
-    "@lodestar/test-utils": "^1.15.0",
+    "@lodestar/test-utils": "^1.15.1",
     "@types/http-proxy": "^1.17.10",
     "@types/yargs": "^17.0.24",
     "axios": "^1.3.4",
diff --git a/packages/reqresp/package.json b/packages/reqresp/package.json
index 3856177449d3..66700cf317d0 100644
--- a/packages/reqresp/package.json
+++ b/packages/reqresp/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -56,9 +56,9 @@
   "dependencies": {
     "@chainsafe/fast-crc32c": "^4.1.1",
     "@libp2p/interface": "^1.1.1",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "it-all": "^3.0.4",
     "it-pipe": "^3.0.1",
     "snappy": "^7.2.2",
@@ -67,8 +67,8 @@
     "uint8arraylist": "^2.4.7"
   },
   "devDependencies": {
-    "@lodestar/logger": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
+    "@lodestar/logger": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
     "libp2p": "1.1.1"
   },
   "peerDependencies": {
diff --git a/packages/spec-test-util/package.json b/packages/spec-test-util/package.json
index f8d953e408fd..e94fc35c7111 100644
--- a/packages/spec-test-util/package.json
+++ b/packages/spec-test-util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/spec-test-util",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Spec test suite generator from yaml test files",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -62,7 +62,7 @@
     "blockchain"
   ],
   "dependencies": {
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/utils": "^1.15.1",
     "async-retry": "^1.3.3",
     "axios": "^1.3.4",
     "rimraf": "^4.4.1",
diff --git a/packages/state-transition/package.json b/packages/state-transition/package.json
index 8a1aea19f140..ed76e116fe82 100644
--- a/packages/state-transition/package.json
+++ b/packages/state-transition/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -63,10 +63,10 @@
     "@chainsafe/persistent-merkle-tree": "^0.6.1",
     "@chainsafe/persistent-ts": "^0.19.1",
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "bigint-buffer": "^1.1.5",
     "buffer-xor": "^2.0.2"
   },
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 038cd743bdd7..1d976c5e609e 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@lodestar/test-utils",
   "private": true,
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Test utilities reused across other packages",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -60,8 +60,8 @@
   "dependencies": {
     "@chainsafe/bls": "7.1.1",
     "@chainsafe/bls-keystore": "^3.0.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "axios": "^1.3.4",
     "testcontainers": "^10.2.1",
     "tmp": "^0.2.1",
diff --git a/packages/types/package.json b/packages/types/package.json
index 1e9b811becfa..3888eeae2cc2 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": {
     ".": {
@@ -73,7 +73,7 @@
   "types": "lib/index.d.ts",
   "dependencies": {
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/params": "^1.15.0"
+    "@lodestar/params": "^1.15.1"
   },
   "keywords": [
     "ethereum",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index fa1dd4fdd829..1a5497c94581 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.15.0",
+  "version": "1.15.1",
   "type": "module",
   "exports": "./lib/index.js",
   "files": [
diff --git a/packages/validator/package.json b/packages/validator/package.json
index 020792107c3b..bbc64ede4de0 100644
--- a/packages/validator/package.json
+++ b/packages/validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lodestar/validator",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "A Typescript implementation of the validator client",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -49,18 +49,18 @@
   "dependencies": {
     "@chainsafe/bls": "7.1.1",
     "@chainsafe/ssz": "^0.14.0",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/db": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
+    "@lodestar/api": "^1.15.1",
+    "@lodestar/config": "^1.15.1",
+    "@lodestar/db": "^1.15.1",
+    "@lodestar/params": "^1.15.1",
+    "@lodestar/state-transition": "^1.15.1",
+    "@lodestar/types": "^1.15.1",
+    "@lodestar/utils": "^1.15.1",
     "bigint-buffer": "^1.1.5",
     "strict-event-emitter-types": "^2.0.0"
   },
   "devDependencies": {
-    "@lodestar/test-utils": "^1.15.0",
+    "@lodestar/test-utils": "^1.15.1",
     "bigint-buffer": "^1.1.5",
     "rimraf": "^4.4.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 27754c484466..ce67d0db390d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2955,11 +2955,6 @@
     "@types/level-errors" "*"
     "@types/node" "*"
 
-"@types/lockfile@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/lockfile/-/lockfile-1.0.2.tgz#3f77e84171a2b7e3198bd5717c7547a54393baf8"
-  integrity sha512-jD5VbvhfMhaYN4M3qPJuhMVUg3Dfc4tvPvLEAXn6GXbs/ajDFtCQahX37GIE65ipTI3I+hEvNaXS3MYAn9Ce3Q==
-
 "@types/lodash@^4.14.192":
   version "4.14.192"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.192.tgz#5790406361a2852d332d41635d927f1600811285"
@@ -3043,6 +3038,13 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
+"@types/proper-lockfile@^4.1.4":
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/@types/proper-lockfile/-/proper-lockfile-4.1.4.tgz#cd9fab92bdb04730c1ada542c356f03620f84008"
+  integrity sha512-uo2ABllncSqg9F1D4nugVl9v93RmjxF6LJzQLMLDdPaXCUIDPeOJ21Gbqi43xNKzBi/WQ0Q0dICqufzQbMjipQ==
+  dependencies:
+    "@types/retry" "*"
+
 "@types/qs@^6.9.7":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -9045,13 +9047,6 @@ locate-path@^7.1.0:
   dependencies:
     p-locate "^6.0.0"
 
-lockfile@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz"
-  integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==
-  dependencies:
-    signal-exit "^3.0.2"
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"