diff --git a/TUTORIAL.md b/TUTORIAL.md
index 7d8d4bda..a234944c 100644
--- a/TUTORIAL.md
+++ b/TUTORIAL.md
@@ -28,8 +28,8 @@ The dependencies of `fabric-chaincode-api` and `fabric-shim` will be required.
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-chaincode-api": "2.1.0",
-    "fabric-shim": "2.1.0"
+    "fabric-chaincode-api": "2.1.1-unstable",
+    "fabric-shim": "2.1.1-unstable"
   }
 }
 
diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json
index b8fda2ab..48eba910 100644
--- a/apis/fabric-contract-api/package.json
+++ b/apis/fabric-contract-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-contract-api",
-  "version": "2.1.0",
-  "tag": "latest",
+  "version": "2.1.1-unstable",
+  "tag": "unstable",
   "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",
   "repository": {
@@ -46,7 +46,7 @@
     "lines": 100
   },
   "dependencies": {
-    "fabric-shim-api": "2.1.0",
+    "fabric-shim-api": "2.1.1-unstable",
     "class-transformer": "^0.2.2",
     "fast-safe-stringify": "~2.0.7",
     "get-params": "^0.1.2",
diff --git a/apis/fabric-shim-api/package.json b/apis/fabric-shim-api/package.json
index ff7b4f21..50e29e54 100644
--- a/apis/fabric-shim-api/package.json
+++ b/apis/fabric-shim-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-shim-api",
-  "version": "2.1.0",
-  "tag": "latest",
+  "version": "2.1.1-unstable",
+  "tag": "unstable",
   "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",
   "repository": {
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index cb31227c..7b28f2be 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -286,7 +286,7 @@ stages:
                 workingFile: '$(Agent.TempDirectory)/.npmrc'
                 customEndpoint: 'fabric-chainode-node-npm'
             - script: |
-                find $(Pipeline.Workspace)/node-tgz/ -maxdepth 1 -type f -name 'fabric-*.tgz' -exec npm publish {} --tag latest \;
+                find $(Pipeline.Workspace)/node-tgz/ -maxdepth 1 -type f -name 'fabric-*.tgz' -exec npm publish {} --tag unstable \;
               displayName: 'npm publish'
         - job: jsdoc_publish
           steps:
@@ -311,13 +311,13 @@ stages:
                 docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
                 echo "Logged in to docker registry"
                 # tag nodeenv image to PACKAGE_VERSION
-                docker tag hyperledger/fabric-nodeenv hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-latest
+                docker tag hyperledger/fabric-nodeenv hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)
                 # push nodeenv to repository
-                docker push hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-latest
+                docker push hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)
                 # publish patch version (3-digit) image
-                ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-latest" --target "hyperledger/fabric-nodeenv:$(BuildData.PACKAGE_VERSION)-latest"
+                ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-nodeenv:$(BuildData.PACKAGE_VERSION)"
                 # publish minor version (2-digit) image
-                ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-latest" --target "hyperledger/fabric-nodeenv:$(BuildData.MINOR_PACKAGE_VERSION)-latest"
+                ./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)" --target "hyperledger/fabric-nodeenv:$(BuildData.MINOR_PACKAGE_VERSION)"
               env:
                 DOCKER_REGISTRY_USERNAME: $(DockerHub-Username)
                 DOCKER_REGISTRY_PASSWORD: $(DockerHub-Password)
diff --git a/docs/_jsdoc/tutorials/using-chaincodeinterface.md b/docs/_jsdoc/tutorials/using-chaincodeinterface.md
index 7b3f7d65..7b9417f7 100644
--- a/docs/_jsdoc/tutorials/using-chaincodeinterface.md
+++ b/docs/_jsdoc/tutorials/using-chaincodeinterface.md
@@ -8,7 +8,7 @@ cd mycc
 // create a new node project
 npm init
 // install fabric-shim at master branch
-npm install 2.1.0
+npm install 2.1.1-unstable
 // or using the released version
 npm install fabric-shim
 touch mychaincode.js
@@ -68,7 +68,7 @@ Finally, update the "start" script in package.json to "node mychaincode.js":
 	"engineStrict": true,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"fabric-shim": "2.1.0"
+		"fabric-shim": "2.1.1-unstable"
 	}
 }
 ```
diff --git a/docs/_jsdoc/tutorials/using-contractinterface.md b/docs/_jsdoc/tutorials/using-contractinterface.md
index 8bc2ad5e..56294de6 100644
--- a/docs/_jsdoc/tutorials/using-contractinterface.md
+++ b/docs/_jsdoc/tutorials/using-contractinterface.md
@@ -28,8 +28,8 @@ The dependencies of `fabric-chaincode-api` and `fabric-shim` will be required.
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-chaincode-api": "2.1.0",
-    "fabric-shim": "2.1.0"
+    "fabric-chaincode-api": "2.1.1-unstable",
+    "fabric-shim": "2.1.1-unstable"
   }
 }
 
diff --git a/libraries/fabric-shim-crypto/package.json b/libraries/fabric-shim-crypto/package.json
index 34f134be..3c038548 100644
--- a/libraries/fabric-shim-crypto/package.json
+++ b/libraries/fabric-shim-crypto/package.json
@@ -1,7 +1,7 @@
 {
     "name": "fabric-shim-crypto",
-    "version": "2.1.0",
-    "tag": "latest",
+    "version": "2.1.1-unstable",
+    "tag": "unstable",
     "description": "A node.js implementation of encryption library for Hyperledger Fabric chaincode shim",
     "main": "index.js",
     "repository": {
diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json
index 04c6743c..7e3d3930 100644
--- a/libraries/fabric-shim/package.json
+++ b/libraries/fabric-shim/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-shim",
-  "version": "2.1.0",
-  "tag": "latest",
+  "version": "2.1.1-unstable",
+  "tag": "unstable",
   "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",
   "bin": {
@@ -61,8 +61,8 @@
     "@grpc/proto-loader": "^0.5.1",
     "@types/node": "^8.9.4",
     "ajv": "^6.5.5",
-    "fabric-contract-api": "2.1.0",
-    "fabric-shim-api": "2.1.0",
+    "fabric-contract-api": "2.1.1-unstable",
+    "fabric-shim-api": "2.1.1-unstable",
     "fs-extra": "8.1.0",
     "grpc": "^1.23.3",
     "reflect-metadata": "^0.1.12",
diff --git a/package.json b/package.json
index 855ee9d3..65177062 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fabric-chaincode-node",
-  "version": "2.1.0",
-  "tag": "latest",
+  "version": "2.1.1-unstable",
+  "tag": "unstable",
   "description": "fabric-chaincode-node monorepo, built with rush",
   "testFabricVersion": "master",
   "testFabricCAVersion": "1.4.4",
diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json
index 87e0f1ee..b7a3f5cb 100644
--- a/test/chaincodes/annotations/package.json
+++ b/test/chaincodes/annotations/package.json
@@ -18,8 +18,8 @@
   "author": "",
   "license": "APACHE-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.0",
-    "fabric-contract-api": "2.1.0",
+    "fabric-shim": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1-unstable",
     "@types/node": "^10.3.6",
     "ts-node": "^3.3.0",
     "tslint": "^5.6.0",
diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json
index 477314eb..692d2779 100644
--- a/test/chaincodes/clientidentity/package.json
+++ b/test/chaincodes/clientidentity/package.json
@@ -15,7 +15,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.0",
-      "fabric-contract-api": "2.1.0"
+      "fabric-shim": "2.1.1-unstable",
+      "fabric-contract-api": "2.1.1-unstable"
     }
 }
diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json
index 0659293b..bf0a3dfd 100644
--- a/test/chaincodes/crosschaincode/package.json
+++ b/test/chaincodes/crosschaincode/package.json
@@ -15,7 +15,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.0",
-      "fabric-contract-api": "2.1.0"
+      "fabric-shim": "2.1.1-unstable",
+      "fabric-contract-api": "2.1.1-unstable"
     }
 }
diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json
index 8ad10f56..e9110a99 100644
--- a/test/chaincodes/crosschaincode2/package.json
+++ b/test/chaincodes/crosschaincode2/package.json
@@ -15,7 +15,7 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.0",
-      "fabric-contract-api": "2.1.0"
+      "fabric-shim": "2.1.1-unstable",
+      "fabric-contract-api": "2.1.1-unstable"
     }
 }
diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json
index 05d5c6d3..b31d3181 100644
--- a/test/chaincodes/crud/package.json
+++ b/test/chaincodes/crud/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.0",
-    "fabric-contract-api": "2.1.0"
+    "fabric-shim": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1-unstable"
   }
 }
diff --git a/test/chaincodes/encryption/package.json b/test/chaincodes/encryption/package.json
index f2f1f946..ee837d6f 100644
--- a/test/chaincodes/encryption/package.json
+++ b/test/chaincodes/encryption/package.json
@@ -15,8 +15,8 @@
     "author": "",
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "2.1.0",
-      "fabric-contract-api": "2.1.0",
-      "fabric-shim-crypto": "2.1.0"
+      "fabric-shim": "2.1.1-unstable",
+      "fabric-contract-api": "2.1.1-unstable",
+      "fabric-shim-crypto": "2.1.1-unstable"
     }
 }
diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json
index 13fc825a..a34c1b2f 100644
--- a/test/chaincodes/events/package.json
+++ b/test/chaincodes/events/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.0",
-    "fabric-contract-api": "2.1.0"
+    "fabric-shim": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1-unstable"
   }
 }
diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json
index 27d3b9fc..ac44b5d2 100644
--- a/test/chaincodes/query/package.json
+++ b/test/chaincodes/query/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.0",
-    "fabric-contract-api": "2.1.0"
+    "fabric-shim": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1-unstable"
   }
 }
diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json
index e19166da..b79429e7 100644
--- a/test/chaincodes/scenario/package.json
+++ b/test/chaincodes/scenario/package.json
@@ -15,7 +15,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "fabric-shim": "2.1.0",
-    "fabric-contract-api": "2.1.0"
+    "fabric-shim": "2.1.1-unstable",
+    "fabric-contract-api": "2.1.1-unstable"
   }
 }
diff --git a/test/fv/package.json b/test/fv/package.json
index fde41f6f..6f3615d9 100644
--- a/test/fv/package.json
+++ b/test/fv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fvtests",
-  "version": "2.1.0",
+  "version": "2.1.1-unstable",
   "description": "fv tests",
   "testFabricVersion": "master",
   "testFabricThirdParty": "0.4.15",
@@ -26,10 +26,10 @@
     "del": "^3.0.0",
     "delay": "4.3.0",
     "eslint": "6.6.0",
-    "fabric-contract-api": "2.1.0",
-    "fabric-shim": "2.1.0",
-    "fabric-shim-api": "2.1.0",
-    "fabric-shim-crypto": "2.1.0",
+    "fabric-contract-api": "2.1.1-unstable",
+    "fabric-shim": "2.1.1-unstable",
+    "fabric-shim-api": "2.1.1-unstable",
+    "fabric-shim-crypto": "2.1.1-unstable",
     "fs-extra": "8.1.0",
     "git-rev-sync": "1.12.0",
     "gulp": "^4.0.0",
diff --git a/tools/toolchain/network/docker-compose/docker-compose-base.yaml b/tools/toolchain/network/docker-compose/docker-compose-base.yaml
index 8eba5f2c..e658b05f 100644
--- a/tools/toolchain/network/docker-compose/docker-compose-base.yaml
+++ b/tools/toolchain/network/docker-compose/docker-compose-base.yaml
@@ -92,7 +92,7 @@ services:
       # # bridge network as the peers
       # # https://docs.docker.com/compose/networking/
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default
-      - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.0
+      - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.1-unstable
       # Allow more time for chaincode container to build on install.
       - CORE_CHAINCODE_EXECUTETIMEOUT=300s
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric