diff --git a/docs/source/install.md b/docs/source/install.md
index 2abd7a9307b..aa6538bf234 100644
--- a/docs/source/install.md
+++ b/docs/source/install.md
@@ -43,8 +43,8 @@ Run the script with the `-h` option to see the options:
 ./install-fabric.sh -h
 Usage: ./install-fabric.sh [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...
         <comp>: Component to install one or more of  d[ocker]|b[inary]|s[amples]. If none specified, all will be installed
-        -f, --fabric-version: FabricVersion (default: '2.5.7')
-        -c, --ca-version: Fabric CA Version (default: '1.5.10')
+        -f, --fabric-version: FabricVersion (default: '2.5.8')
+        -c, --ca-version: Fabric CA Version (default: '1.5.11')
 ```
 
 ## Choosing which components
@@ -70,10 +70,10 @@ If no arguments are supplied, then the arguments `docker binary samples` are ass
 
 By default the latest version of the components are used; these can be altered by using the options `--fabric-version` and `-ca-version`.  `-f` and `-c` are the respective short forms.
 
-For example, to download the v2.5.7 binaries, run this command
+For example, to download the v2.5.8 binaries, run this command
 
 ```bash
-./install-fabric.sh --fabric-version 2.5.7 binary
+./install-fabric.sh --fabric-version 2.5.8 binary
 ```
 
 You have completed installing Fabric samples, Docker images, and binaries to your system.
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 7ffd4c83517..855d7ed01de 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -6,9 +6,9 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.5.7
+VERSION=2.5.8
 # if ca version not passed in, default to latest released version
-CA_VERSION=1.5.10
+CA_VERSION=1.5.11
 
 REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}
 
@@ -30,8 +30,8 @@ printHelp() {
     echo "-s : bypass fabric-samples repo clone"
     echo "-b : bypass download of platform-specific binaries"
     echo
-    echo "e.g. bootstrap.sh 2.5.7 1.5.10 -s"
-    echo "will download docker images and binaries for Fabric v2.5.7 and Fabric CA v1.5.10"
+    echo "e.g. bootstrap.sh 2.5.8 1.5.11 -s"
+    echo "will download docker images and binaries for Fabric v2.5.8 and Fabric CA v1.5.11"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories
diff --git a/scripts/install-fabric.sh b/scripts/install-fabric.sh
index 5b60bbb7d27..fe1b8cc7b70 100755
--- a/scripts/install-fabric.sh
+++ b/scripts/install-fabric.sh
@@ -21,8 +21,8 @@ _arg_comp=('' )
 
 # if version not passed in, default to latest released version
 # if ca version not passed in, default to latest released version
-_arg_fabric_version="2.5.7"
-_arg_ca_version="1.5.10"
+_arg_fabric_version="2.5.8"
+_arg_ca_version="1.5.11"
 
 REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}
 
@@ -55,8 +55,8 @@ print_help()
 {
 	printf 'Usage: %s [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...\n' "$0"
 	printf '\t%s\n' "<comp> Component to install, one or more of  docker | binary | samples | podman  First letter of component also accepted; If none specified docker | binary | samples is assumed"
-	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.7')"
-	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.10')"
+	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.8')"
+	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.11')"
 }