diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/tasks/apply.yml b/src/agent/ansible/roles/deploy_compose/fabricsetup/tasks/apply.yml
index 0672e6b0b..9ee2b8887 100755
--- a/src/agent/ansible/roles/deploy_compose/fabricsetup/tasks/apply.yml
+++ b/src/agent/ansible/roles/deploy_compose/fabricsetup/tasks/apply.yml
@@ -205,7 +205,7 @@
   command: "docker pull {{ fabric.repo.url }}{{ item.name }}"
   when: item.flag | length > 0 and fabric.baseimage_tag | length > 0
   with_items:
-    - { name: "fabric-ca:{{ helpertag }}", flag: "{{ cas }}" }
+    - { name: "fabric-ca:{{ fabric.ca.image_tag | default(thetag) }}", flag: "{{ cas }}" }
     - { name: "fabric-zookeeper:{{ helpertag }}", flag: "{{ zookeepers }}" }
     - { name: "fabric-kafka:{{ helpertag }}", flag: "{{ kafkas }}" }
     - { name: "fabric-couchdb:{{ helpertag }}", flag: "{{ peers }}" }
diff --git a/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/ca-compose.j2 b/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/ca-compose.j2
index 2517e6e71..fcd9b3486 100755
--- a/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/ca-compose.j2
+++ b/src/agent/ansible/roles/deploy_compose/fabricsetup/templates/ca-compose.j2
@@ -6,7 +6,7 @@ services:
 {% for ca in cas %}
   {{ ca.name }}:
     container_name: {{ ca.name}}
-    image: {{ fabric.repo.url }}fabric-ca:{{ helpertag | default(thetag) }}
+    image: {{ fabric.repo.url }}fabric-ca:{{ fabric.ca.image_tag | default(thetag) }}
     network_mode: bridge
     hostname: {{ ca.name}}
     environment:
diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml b/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml
index 0bb437a00..e8fd9e648 100755
--- a/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml
+++ b/src/agent/ansible/roles/deploy_k8s/fabricsetup/tasks/apply.yml
@@ -216,7 +216,7 @@
   command: "docker pull {{ fabric.repo.url }}{{ item.name }}"
   when: item.flag | length > 0 and fabric.baseimage_tag | length > 0
   with_items:
-    - { name: "fabric-ca:{{ helpertag }}", flag: "{{ cas }}" }
+    - { name: "fabric-ca:{{ fabric.ca.image_tag | default(thetag) }}", flag: "{{ cas }}" }
     - { name: "fabric-zookeeper:{{ helpertag }}", flag: "{{ zookeepers }}" }
     - { name: "fabric-kafka:{{ helpertag }}", flag: "{{ kafkas }}" }
     - { name: "fabric-couchdb:{{ helpertag }}", flag: "{{ peers }}" }
diff --git a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2 b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2
index 19019e78d..7ea16711e 100755
--- a/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2
+++ b/src/agent/ansible/roles/deploy_k8s/fabricsetup/templates/fabric-pod.j2
@@ -96,7 +96,7 @@ spec:
         path: {{ fabricworkdir }}/run/keyfiles/{{ ca.org }}
   containers:
     - name: {{ ca.name }}
-      image: {{ fabric.repo.url }}fabric-ca:{{ helpertag }}
+      image: {{ fabric.repo.url }}fabric-ca:{{ fabric.ca.image_tag | default(thetag) }}
       imagePullPolicy: IfNotPresent
       env:
         - { name: "FABRIC_CA_HOME", value: "/etc/hyperledger/fabric-ca-server-config/ca" }
diff --git a/src/agent/ansible/vars/bc1st.yml b/src/agent/ansible/vars/bc1st.yml
index b0184aa3b..00756690a 100755
--- a/src/agent/ansible/vars/bc1st.yml
+++ b/src/agent/ansible/vars/bc1st.yml
@@ -62,13 +62,13 @@ fabric: {
   #     s390x-0.4.2                                # release 0.4.2 for s390x
   #     048c91eb47812582f36665fbea3d7e0e68e396bf   # commit build
   #     x86_64-1.0.0-snapshot-8d3275f              # snapshot build
-  baseimage_tag: "x86_64-1.1.0-alpha",
+  baseimage_tag: "x86_64-1.1.0",
 
   # The container tag for accessory fabric components such as ca, kafka,
   # zookeeper and couchdb. It has to be the full tag just like the
   # baseimage_tag
-  helper_tag: "x86_64-1.1.0-preview",
-  ca: { admin: "admin", adminpw: "adminpw" },
+  helper_tag: "x86_64-0.4.6",
+  ca: { admin: "admin", adminpw: "adminpw", image_tag: "x86_64-1.1.0" },
 
   # Only use this field when you have a docker repository.
   repo: {
diff --git a/src/agent/ansible/vars/bc2nd.yml b/src/agent/ansible/vars/bc2nd.yml
index 365d8285c..24fad0e2d 100755
--- a/src/agent/ansible/vars/bc2nd.yml
+++ b/src/agent/ansible/vars/bc2nd.yml
@@ -34,13 +34,13 @@ fabric: {
   #     s390x-0.4.2                                # release 0.4.2 for s390x
   #     048c91eb47812582f36665fbea3d7e0e68e396bf   # commit build
   #     x86_64-1.0.0-snapshot-8d3275f              # snapshot build
-  baseimage_tag: "x86_64-1.1.0-alpha",
+  baseimage_tag: "x86_64-1.1.0",
 
   # The container tag for accessory fabric components such as ca, kafka,
   # zookeeper and couchdb. It has to be the full tag just like the
   # baseimage_tag
-  helper_tag: "x86_64-1.1.0-preview",
-  ca: { admin: "admin", adminpw: "adminpw" },
+  helper_tag: "x86_64-0.4.6",
+  ca: { admin: "admin", adminpw: "adminpw", image_tag: "x86_64-1.1.0" },
 
   # Only use this field when you have a docker repository.
   repo: {
diff --git a/src/agent/ansible/vars/vb1st.yml b/src/agent/ansible/vars/vb1st.yml
index adb95c968..09a7b1f1d 100755
--- a/src/agent/ansible/vars/vb1st.yml
+++ b/src/agent/ansible/vars/vb1st.yml
@@ -16,8 +16,8 @@ fabric: {
   ssh_user: "ubuntu",
 
   # options are "goleveldb", "CouchDB", default is goleveldb
-  peer_db: "CouchDB",
-  tls: false,
+  peer_db: "goleveldb",
+  tls: true,
   logging_level: "ERROR",
 
   # The following section defines how the fabric network is going to be made up
@@ -31,14 +31,14 @@ fabric: {
     fabric001: {
       cas: [],
       peers: ["anchor@peer1st.orga", "anchor@peer1st.orgb"],
-      orderers: ["orderer1st.orgc", "orderer1st.orgd"],
+      orderers: ["orderer1st.orgc"],
       zookeepers: ["zookeeper1st"],
       kafkas: ["kafka1st"]
     },
     fabric002: {
-      cas: [],
+      cas: ["ca1st.orga", "ca1st.orgb", "ca1st.orgc"],
       peers: ["worker@peer2nd.orga", "worker@peer2nd.orgb"],
-      orderers: ["orderer2nd.orgc", "orderer2nd.orgd"],
+      orderers: ["orderer2nd.orgc"],
       zookeepers: [],
       kafkas: []
     }
@@ -55,13 +55,13 @@ fabric: {
   #     s390x-0.4.2                                # release 0.4.2 for s390x
   #     048c91eb47812582f36665fbea3d7e0e68e396bf   # commit build
   #     x86_64-1.0.0-snapshot-8d3275f              # snapshot build
-  baseimage_tag: "x86_64-1.1.0-alpha",
+  baseimage_tag: "x86_64-1.1.0",
 
   # The container tag for accessory fabric components such as ca, kafka,
   # zookeeper and couchdb. It has to be the full tag just like the
   # baseimage_tag
-  helper_tag: "x86_64-1.1.0-preview",
-  ca: { admin: "admin", adminpw: "adminpw" },
+  helper_tag: "x86_64-0.4.6",
+  ca: { admin: "admin", adminpw: "adminpw", image_tag: "x86_64-1.1.0" },
 
   # Only use this field when you have a docker repository.
   repo: {
@@ -73,6 +73,6 @@ fabric: {
     # locations to download fabric binaries. This url should point to a
     # compressed such as tar or zip file which contains necessary binaries
     # such as configtxgen, configtxlator, cryptogen etc.
-    bin: "https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric-build/linux-amd64-ff6f6dbffed57efb9f7d8886b4a47949ce2d4396/hyperledger-fabric-build-linux-amd64-ff6f6dbffed57efb9f7d8886b4a47949ce2d4396.tar.gz"
+    bin: "https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/linux-amd64-1.1.0/hyperledger-fabric-linux-amd64-1.1.0.tar.gz"
   }
 }