diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json
index 2d4ca9a6..c2d5dfa6 100644
--- a/apis/fabric-contract-api/package.json
+++ b/apis/fabric-contract-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-contract-api",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "tag": "latest",
   "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
@@ -22,7 +22,7 @@
     "Fabric Shim"
   ],
   "engines": {
-    "node": "^18.0.0"
+    "node": ">=18"
   },
   "license": "Apache-2.0",
   "types": "./types/index.d.ts",
@@ -45,7 +45,7 @@
     "lines": 100
   },
   "dependencies": {
-    "fabric-shim-api": "2.5.4",
+    "fabric-shim-api": "2.5.5",
     "class-transformer": "^0.4.0",
     "fast-safe-stringify": "^2.1.1",
     "get-params": "^0.1.2",
diff --git a/apis/fabric-shim-api/package.json b/apis/fabric-shim-api/package.json
index 2f9d5002..da39b314 100644
--- a/apis/fabric-shim-api/package.json
+++ b/apis/fabric-shim-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-shim-api",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "tag": "latest",
   "description": "A node.js API of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
@@ -18,7 +18,7 @@
     "Fabric Shim"
   ],
   "engines": {
-    "node": "^18.0.0",
+    "node": ">=18",
     "eslint": "^6.6.0"
   },
   "types": "./types/index.d.ts",
diff --git a/docker/fabric-nodeenv/package.json b/docker/fabric-nodeenv/package.json
index 7a1b3693..4a97e7e8 100644
--- a/docker/fabric-nodeenv/package.json
+++ b/docker/fabric-nodeenv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-nodeenv",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "",
   "main": "docker.js",
   "scripts": {
diff --git a/docs/package.json b/docs/package.json
index 1bf1f675..2f7da52b 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-shim-docs",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "",
   "private": true,
   "scripts": {
@@ -8,7 +8,7 @@
     "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
   },
   "dependencies": {
-    "fabric-ledger": "2.5.4"
+    "fabric-ledger": "2.5.5"
   },
   "devDependencies": {
     "ink-docstrap": "^1.3.2",
diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json
index 51d3b7fa..f9f5b55b 100644
--- a/libraries/fabric-ledger/package.json
+++ b/libraries/fabric-ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-ledger",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "tag": "latest",
   "description": "A node.js implementation of Hyperledger Fabric ledger api, to allow access to ledger data from smart contracts",
   "main": "lib/index.js",
@@ -48,7 +48,7 @@
     "lines": 100
   },
   "dependencies": {
-    "fabric-contract-api": "2.5.4",
+    "fabric-contract-api": "2.5.5",
     "winston": "^3.7.2"
   },
   "devDependencies": {
diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json
index 2885db2d..a4d6db8f 100644
--- a/libraries/fabric-shim/package.json
+++ b/libraries/fabric-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-shim",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "tag": "latest",
   "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
   "main": "index.js",
@@ -29,7 +29,7 @@
     "Fabric Shim"
   ],
   "engines": {
-    "node": "^18.0.0"
+    "node": ">=18"
   },
   "types": "./types/index.d.ts",
   "license": "Apache-2.0",
@@ -59,8 +59,8 @@
     "@hyperledger/fabric-protos": "0.1.0-dev.2300102001.1",
     "@types/node": "^16.11.1",
     "ajv": "^6.12.2",
-    "fabric-contract-api": "2.5.4",
-    "fabric-shim-api": "2.5.4",
+    "fabric-contract-api": "2.5.5",
+    "fabric-shim-api": "2.5.5",
     "fast-safe-stringify": "^2.1.1",
     "long": "^5.2.3",
     "reflect-metadata": "^0.1.13",
diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json
index c6872435..323b4c1d 100644
--- a/test/chaincodes/annotations/package.json
+++ b/test/chaincodes/annotations/package.json
@@ -2,7 +2,7 @@
   "name": "ts_chaincode",
   "description": "Chaincode testing typescript functionality and annotations",
   "engines": {
-    "node": "^18.0.0"
+    "node": ">=18"
   },
   "scripts": {
     "build": "tsc",
@@ -13,13 +13,13 @@
   "typings": "dist/index.d.ts",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "APACHE-2.0",
   "dependencies": {
     "@types/node": "^16.11.4",
-    "fabric-contract-api": "2.5.4",
-    "fabric-shim": "2.5.4",
+    "fabric-contract-api": "2.5.5",
+    "fabric-shim": "2.5.5",
     "ts-node": "^3.3.0",
     "tslint": "^5.6.0",
     "typescript": "^4.0.2"
diff --git a/test/chaincodes/annotations/src/test_contract/expected-metadata.json b/test/chaincodes/annotations/src/test_contract/expected-metadata.json
index 8d6c6ec5..fa9c7567 100644
--- a/test/chaincodes/annotations/src/test_contract/expected-metadata.json
+++ b/test/chaincodes/annotations/src/test_contract/expected-metadata.json
@@ -107,7 +107,7 @@
         }
     },
     "info": {
-        "version": "2.5.4",
+        "version": "2.5.5",
         "title": "ts_chaincode"
     },
     "components": {
diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json
index 0a15dd47..b7633f90 100644
--- a/test/chaincodes/clientidentity/package.json
+++ b/test/chaincodes/clientidentity/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json
index 6ee33dd5..2fe5485e 100644
--- a/test/chaincodes/crosschaincode/package.json
+++ b/test/chaincodes/crosschaincode/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json
index 7120efbe..e3458ca7 100644
--- a/test/chaincodes/crosschaincode2/package.json
+++ b/test/chaincodes/crosschaincode2/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json
index d9e84e65..d4cf00b9 100644
--- a/test/chaincodes/crud/package.json
+++ b/test/chaincodes/crud/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json
index ca1c8de5..3e999d7b 100644
--- a/test/chaincodes/events/package.json
+++ b/test/chaincodes/events/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/ledger/package.json b/test/chaincodes/ledger/package.json
index 3bc7b28c..f94f73e5 100644
--- a/test/chaincodes/ledger/package.json
+++ b/test/chaincodes/ledger/package.json
@@ -10,12 +10,12 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4",
-    "fabric-ledger": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5",
+    "fabric-ledger": "2.5.5"
   }
 }
diff --git a/test/chaincodes/privateData/package.json b/test/chaincodes/privateData/package.json
index d8859e14..97fe0bb1 100644
--- a/test/chaincodes/privateData/package.json
+++ b/test/chaincodes/privateData/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json
index 32efac9d..ae87b456 100644
--- a/test/chaincodes/query/package.json
+++ b/test/chaincodes/query/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json
index bf9cf350..376518d4 100644
--- a/test/chaincodes/scenario/package.json
+++ b/test/chaincodes/scenario/package.json
@@ -10,11 +10,11 @@
   "main": "index.js",
   "engine-strict": true,
   "engineStrict": true,
-  "version": "2.5.4",
+  "version": "2.5.5",
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.5.4",
-    "fabric-contract-api": "2.5.4"
+    "fabric-shim": "2.5.5",
+    "fabric-contract-api": "2.5.5"
   }
 }
diff --git a/test/e2e/package.json b/test/e2e/package.json
index 91d34362..d9a60550 100644
--- a/test/e2e/package.json
+++ b/test/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-e2e-tests",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "",
   "main": "docker.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "devDependencies": {
     "git-rev-sync": "3.0.1",
     "gulp": "^4.0.2",
-    "toolchain": "2.5.4",
+    "toolchain": "1.0.0-dev",
     "delay": "5.0.0",
     "ip": "^1.1.5",
     "ajv": "^6.12.2",
diff --git a/test/e2e/scenario.js b/test/e2e/scenario.js
index 94049b8f..ee2ee084 100644
--- a/test/e2e/scenario.js
+++ b/test/e2e/scenario.js
@@ -57,7 +57,7 @@ const queryFunctions = async () => {
 
     const metadata = JSON.parse(stdout);
 
-    const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.5.4","title":"chaincode"},"components":{"schemas":{}}}';
+    const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.5.5","title":"chaincode"},"components":{"schemas":{}}}';
 
     const schema = fs.readFileSync(path.join(__dirname, '../../apis/fabric-contract-api/schema/contract-schema.json'));
 
diff --git a/test/fv/package.json b/test/fv/package.json
index d3e3fdeb..3d792eb2 100644
--- a/test/fv/package.json
+++ b/test/fv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fvtests",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "fv tests",
   "testFabricVersion": "main",
   "testFabricThirdParty": "0.4.15",
@@ -25,9 +25,9 @@
     "del": "^3.0.0",
     "delay": "5.0.0",
     "eslint": "^6.6.0",
-    "fabric-contract-api": "2.5.4",
-    "fabric-shim": "2.5.4",
-    "fabric-shim-api": "2.5.4",
+    "fabric-contract-api": "2.5.5",
+    "fabric-shim": "2.5.5",
+    "fabric-shim-api": "2.5.5",
     "git-rev-sync": "3.0.1",
     "gulp": "^4.0.2",
     "ip": "^1.1.5",
diff --git a/tools/scripts/updateversions.sh b/tools/scripts/updateversions.sh
index 1603b924..326bff26 100755
--- a/tools/scripts/updateversions.sh
+++ b/tools/scripts/updateversions.sh
@@ -10,7 +10,7 @@ fi
 NEW_VERSION="$1"
 echo "Setting new version to '${NEW_VERSION}'"
 
-DEPENDENCIES=( fabric-contract-api fabric-shim-api fabric-ledger toolchain )
+DEPENDENCIES=( fabric-contract-api fabric-shim-api fabric-shim fabric-ledger )
 
 updatePackageVersion() {
     npm --allow-same-version --no-git-tag-version version "$1"
@@ -21,18 +21,21 @@ updatePackageVersion() {
 
 updateDependencyVersion() {
     local packageJson
-    packageJson=$(node -e "const pkg = require('./package.json'); if (pkg.dependencies['$1']) pkg.dependencies['$1'] = '$2'; console.log(JSON.stringify(pkg, undefined, 2))")
+    packageJson=$(node -e "const pkg = require('./package.json'); if (pkg.dependencies?.['$1']) pkg.dependencies['$1'] = '$2'; console.log(JSON.stringify(pkg, undefined, 2))")
     echo "${packageJson}" > package.json
 }
 
 while read -r PACKAGE; do
     echo "Updating '${PACKAGE}'"
     ( cd "$(dirname "${PACKAGE}")" && updatePackageVersion "${NEW_VERSION}" )
-done <<< "$(find . -type d \( -name node_modules -o -name common \) -prune -o -type f -name package.json -print)"
+done <<< "$(find . -type d \( -name node_modules -o -name common -o -name tools \) -prune -o -type f -name package.json -print)"
 
 MAJOR_MINOR=$(cut -d. -f-2 <<< "${NEW_VERSION}")
 
 echo "Please also check these files containing ${MAJOR_MINOR}.n"
 # NB - the grep regexp syntax is a little different
 MAJOR_MINOR_REGEX="${MAJOR_MINOR/./\.}\.\?[0-9]"
-find . -type d \( -name node_modules -o -name common \) -prune -o -type f -name '*.js' -exec grep "${MAJOR_MINOR_REGEX}" {} +
+find ./test \
+    -type d \( -name node_modules -o -name '.*' \) -prune \
+    -o -type f -name package.json -prune \
+    -o -type f \( -name '*.js' -o -name '*.json' \) -exec grep "${MAJOR_MINOR_REGEX}" {} +
diff --git a/tools/toolchain/package.json b/tools/toolchain/package.json
index ba5f857b..dbc6a113 100644
--- a/tools/toolchain/package.json
+++ b/tools/toolchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "toolchain",
-  "version": "2.5.4",
+  "version": "1.0.0-dev",
   "description": "",
   "main": "index.js",
   "scripts": {