diff --git a/README.md b/README.md
index c1c42c74..52b67ed5 100644
--- a/README.md
+++ b/README.md
@@ -199,10 +199,10 @@ EOF
 
 ```bash
 export PEER_IMAGE=hyperledger/fabric-peer
-export PEER_VERSION=3.0.0-preview
+export PEER_VERSION=2.5.5
 
 export ORDERER_IMAGE=hyperledger/fabric-orderer
-export ORDERER_VERSION=3.0.0-preview
+export ORDERER_VERSION=2.5.5
 
 export CA_IMAGE=hyperledger/fabric-ca
 export CA_VERSION=1.5.7
@@ -213,10 +213,10 @@ export CA_VERSION=1.5.7
 
 ```bash
 export PEER_IMAGE=hyperledger/fabric-peer
-export PEER_VERSION=3.0.0-preview
+export PEER_VERSION=2.5.5
 
 export ORDERER_IMAGE=hyperledger/fabric-orderer
-export ORDERER_VERSION=3.0.0-preview
+export PEER_VERSION=2.5.5
 
 export CA_IMAGE=hyperledger/fabric-ca             
 export CA_VERSION=1.5.7
@@ -293,12 +293,12 @@ kubectl hlf ca register --name=org1-ca --user=peer --secret=peerpw --type=peer \
 ### Deploy a peer
 
 ```bash
-kubectl hlf peer create --statedb=couchdb --image=$PEER_IMAGE --version=$PEER_VERSION --storage-class=standard --enroll-id=peer --mspid=Org1MSP \
+kubectl hlf peer create --statedb=leveldb --image=$PEER_IMAGE --version=$PEER_VERSION --storage-class=standard --enroll-id=peer --mspid=Org1MSP \
         --enroll-pw=peerpw --capacity=5Gi --name=org1-peer0 --ca-name=org1-ca.default \
         --hosts=peer0-org1.localho.st --istio-port=443
 
 
-kubectl hlf peer create --statedb=couchdb --image=$PEER_IMAGE --version=$PEER_VERSION --storage-class=standard --enroll-id=peer --mspid=Org1MSP \
+kubectl hlf peer create --statedb=leveldb --image=$PEER_IMAGE --version=$PEER_VERSION --storage-class=standard --enroll-id=peer --mspid=Org1MSP \
         --enroll-pw=peerpw --capacity=5Gi --name=org1-peer1 --ca-name=org1-ca.default \
         --hosts=peer1-org1.localho.st --istio-port=443
 
@@ -365,16 +365,6 @@ kubectl hlf ordnode create --image=$ORDERER_IMAGE --version=$ORDERER_VERSION \
     --hosts=orderer2-ord.localho.st --admin-hosts=admin-orderer2-ord.localho.st --istio-port=443
 
 
-kubectl hlf ordnode create --image=$ORDERER_IMAGE --version=$ORDERER_VERSION \
-    --storage-class=standard --enroll-id=orderer --mspid=OrdererMSP \
-    --enroll-pw=ordererpw --capacity=2Gi --name=ord-node4 --ca-name=ord-ca.default \
-    --hosts=orderer3-ord.localho.st --admin-hosts=admin-orderer3-ord.localho.st --istio-port=443
-
-kubectl hlf ordnode create --image=$ORDERER_IMAGE --version=$ORDERER_VERSION \
-    --storage-class=standard --enroll-id=orderer --mspid=OrdererMSP \
-    --enroll-pw=ordererpw --capacity=2Gi --name=ord-node5 --ca-name=ord-ca.default \
-    --hosts=orderer4-ord.localho.st --admin-hosts=admin-orderer4-ord.localho.st --istio-port=443
-
 
 kubectl wait --timeout=180s --for=condition=Running fabricorderernodes.hlf.kungfusoftware.es --all
 ```
@@ -408,6 +398,20 @@ kubectl hlf ca enroll --name=ord-ca --namespace=default \
     --ca-name tlsca  --output orderermsp.yaml
 ```
 
+### Register and enrolling Org1MSP Orderer identity
+
+```bash
+# register
+kubectl hlf ca register --name=org1-ca --user=admin --secret=adminpw \
+    --type=admin --enroll-id enroll --enroll-secret=enrollpw --mspid=Org1MSP
+
+# enroll
+
+kubectl hlf ca enroll --name=org1-ca --namespace=default \
+    --user=admin --secret=adminpw --mspid Org1MSP \
+    --ca-name tlsca  --output org1msp-tlsca.yaml
+```
+
 
 ### Register and enrolling Org1MSP identity
 
@@ -421,6 +425,12 @@ kubectl hlf ca enroll --name=org1-ca --namespace=default \
     --user=admin --secret=adminpw --mspid Org1MSP \
     --ca-name ca  --output org1msp.yaml
 
+# enroll
+kubectl hlf identity create --name org1-admin --namespace default \
+    --ca-name org1-ca --ca-namespace default \
+    --ca ca --mspid Org1MSP --enroll-id admin --enroll-secret adminpw
+
+
 ```
 
 ### Create the secret
@@ -445,9 +455,9 @@ kubectl apply -f - <<EOF
 apiVersion: hlf.kungfusoftware.es/v1alpha1
 kind: FabricMainChannel
 metadata:
-  name: demo
+  name: demo2
 spec:
-  name: demo
+  name: demo2
   adminOrdererOrganizations:
     - mspID: OrdererMSP
   adminPeerOrganizations:
@@ -493,7 +503,41 @@ spec:
       secretKey: org1msp.yaml
       secretName: wallet
       secretNamespace: default
-  externalPeerOrganizations: []
+  externalPeerOrganizations: 
+  - mspID: Org2MSP
+    tlsRootCert: |
+        -----BEGIN CERTIFICATE-----
+        MIICRjCCAeugAwIBAgIQHA5nWgCvnS9ECuauCtat6TAKBggqhkjOPQQDAjBtMQsw
+        CQYDVQQGEwJFUzERMA8GA1UEBxMIQWxpY2FudGUxETAPBgNVBAkTCEFsaWNhbnRl
+        MRkwFwYDVQQKExBLdW5nIEZ1IFNvZnR3YXJlMQ0wCwYDVQQLEwRUZWNoMQ4wDAYD
+        VQQDEwV0bHNjYTAeFw0yMzExMTIxNTA3MTlaFw0zMzExMTMxNTA3MTlaMG0xCzAJ
+        BgNVBAYTAkVTMREwDwYDVQQHEwhBbGljYW50ZTERMA8GA1UECRMIQWxpY2FudGUx
+        GTAXBgNVBAoTEEt1bmcgRnUgU29mdHdhcmUxDTALBgNVBAsTBFRlY2gxDjAMBgNV
+        BAMTBXRsc2NhMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEVB/ZqhVePy96JJH/
+        QhYCT6hRlH7xQVSrTwI1QjLG6GgENV2c10m2EkXH/BHpLJCjZ8ZkGiqVVx/XMxZd
+        E6p1B6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+        BgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCBcmb8svFB8Yn96e3d4
+        Ft+8wZTrAYLielLn6Je/zxbjODAKBggqhkjOPQQDAgNJADBGAiEA3ad5GVhA5RSr
+        mjhnKlazFh53einWYfWxcYNy42v+EbcCIQCt+Fc4nzlMg0ebG3HDlpa9wjJpX9MW
+        caEunJxSdY4vWg==
+        -----END CERTIFICATE-----
+    signRootCert: |
+        -----BEGIN CERTIFICATE-----
+        MIICQTCCAeagAwIBAgIRALIMDeWXSDaW2cYssTwLrTAwCgYIKoZIzj0EAwIwajEL
+        MAkGA1UEBhMCRVMxETAPBgNVBAcTCEFsaWNhbnRlMREwDwYDVQQJEwhBbGljYW50
+        ZTEZMBcGA1UEChMQS3VuZyBGdSBTb2Z0d2FyZTENMAsGA1UECxMEVGVjaDELMAkG
+        A1UEAxMCY2EwHhcNMjMxMTEyMTUwNzE5WhcNMzMxMTEzMTUwNzE5WjBqMQswCQYD
+        VQQGEwJFUzERMA8GA1UEBxMIQWxpY2FudGUxETAPBgNVBAkTCEFsaWNhbnRlMRkw
+        FwYDVQQKExBLdW5nIEZ1IFNvZnR3YXJlMQ0wCwYDVQQLEwRUZWNoMQswCQYDVQQD
+        EwJjYTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAomf+HmUFMdRS7D+IZRCEkQ
+        QEDyrakkXYEE/vwSlXhSW5PsVVXQdi/wmXj2YwoPqsDk2IrXc7KT2tni5wOxJ8mj
+        bTBrMA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+        AwEwDwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQgESLOdwga9AciHgTGFTR6Zxzh
+        Z/vpQ2gC3V0MbzFvfOYwCgYIKoZIzj0EAwIDSQAwRgIhAKLN7BlISJJzjjHOqJ25
+        EFfWSywv6MgddOsGgrQxsedCAiEAxhMj/EJcYvVu5rr+xiHo7TarixkdvmA5k/eW
+        kOWiji0=
+        -----END CERTIFICATE-----
+
   ordererOrganizations:
     - caName: "ord-ca"
       caNamespace: "default"
@@ -502,11 +546,11 @@ spec:
           port: 7053
       mspID: OrdererMSP
       ordererEndpoints:
-        - ord-node1:7050
+        - orderer0-ord.localho.st:443
       orderersToJoin: []
   orderers:
-    - host: ord-node1
-      port: 7050
+    - host: orderer0-ord.localho.st
+      port: 443
       tlsCert: |-
 ${ORDERER0_TLS_CERT}
 
@@ -524,17 +568,17 @@ kubectl apply -f - <<EOF
 apiVersion: hlf.kungfusoftware.es/v1alpha1
 kind: FabricFollowerChannel
 metadata:
-  name: testbft02-org1msp
+  name: demo2-org1msp
 spec:
   anchorPeers:
-    - host: org1-peer0.default
-      port: 7051
+    - host: peer0-org1.localho.st
+      port: 443
   hlfIdentity:
     secretKey: org1msp.yaml
     secretName: wallet
     secretNamespace: default
   mspId: Org1MSP
-  name: testbft02
+  name: demo2
   externalPeersToJoin: []
   orderers:
     - certificate: |
@@ -683,12 +727,54 @@ At this point, you should have:
 
 - Ordering service with 1 nodes and a CA
 - Peer organization with a peer and a CA
-- A channel **demo**
+- A channel **demo2**
 - A chaincode install in peer0
 - A chaincode approved and committed
 
 If something went wrong or didn't work, please, open an issue.
 
+
+
+### Prepare connection string for a peer
+
+To prepare the connection string, we have to create a CRD of type `FabricNetworkConfig` with the following command:
+
+```bash
+kubectl apply -f - <<EOF
+apiVersion: hlf.kungfusoftware.es/v1alpha1
+kind: FabricNetworkConfig
+metadata:
+  name: nc
+  namespace: default
+spec:
+  channels:
+    - testbft02
+  identities:
+    - name: org1-admin
+      namespace: default
+  internal: false
+  namespaces: []
+  organization: ''
+  organizations:
+    - Org1MSP
+    - OrdererMSP
+  secretName: nc-networkconfig
+EOF
+
+```
+## Launch the explorer
+
+```bash
+export API_HOST=operator-api.localho.st
+export HLF_SECRET_NAME="nc-networkconfig"
+export HLF_MSPID="Org1MSP"
+export HLF_SECRET_KEY="config.yaml" # e.g. networkConfig.yaml
+export HLF_USER="org1-admin-default"
+kubectl hlf operatorapi create --name=operator-api --namespace=default --version="v0.0.17-beta9" --hosts=$API_HOST --ingress-class-name=istio \
+          --hlf-mspid="${HLF_MSPID}" --hlf-secret="${HLF_SECRET_NAME}" --hlf-secret-key="${HLF_SECRET_KEY}" \
+          --hlf-user="${HLF_USER}"
+```
+
 ## Cleanup the environment
 
 ```bash
diff --git a/charts/hlf-ca/values.yaml b/charts/hlf-ca/values.yaml
index cb2798ed..312e41f5 100644
--- a/charts/hlf-ca/values.yaml
+++ b/charts/hlf-ca/values.yaml
@@ -26,4 +26,4 @@ gatewayApi:
   gatewayName: ""
   gatewayNamespace: ""
 
-envVars: []
\ No newline at end of file
+envVars: []
diff --git a/charts/hlf-ordnode/templates/service.yaml b/charts/hlf-ordnode/templates/service.yaml
index 25c2a933..f7b4f0db 100644
--- a/charts/hlf-ordnode/templates/service.yaml
+++ b/charts/hlf-ordnode/templates/service.yaml
@@ -7,6 +7,10 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
+    - port: 443
+      targetPort: 7050
+      protocol: TCP
+      name: grpc-443
     - port: {{ .Values.service.port }}
       targetPort: 7050
       protocol: TCP
diff --git a/charts/hlf-ordnode/values.yaml b/charts/hlf-ordnode/values.yaml
index f90f15ff..a147a64c 100644
--- a/charts/hlf-ordnode/values.yaml
+++ b/charts/hlf-ordnode/values.yaml
@@ -8,13 +8,7 @@ genesis: CiIaIDucvmxr45nIpNz5bdNbGR37tbG28dfCtU2Uz8ixeKBAEuhDCuVDCuJDCnwKXggBEAE
 bootstrapMethod: "none"
 channelParticipationEnabled: false
 
-resources:
-  limits:
-    cpu: 100m
-    memory: 128Mi
-  requests:
-    cpu: 100m
-    memory: 128Mi
+resources: {}
 
 proxy:
   enabled: false
diff --git a/charts/hlf-peer/values.yaml b/charts/hlf-peer/values.yaml
index e7352f46..40603998 100644
--- a/charts/hlf-peer/values.yaml
+++ b/charts/hlf-peer/values.yaml
@@ -8,6 +8,12 @@ istio:
   hosts: []
   ingressGateway: ingressgateway
 
+traefik:
+  entryPoints: []
+  middlewares: []
+  hosts: []
+
+
 dockerSocketPath: /var/run/docker.sock
 
 envVars: []
@@ -87,13 +93,7 @@ couchdb:
   pullPolicy: IfNotPresent
 
 resources:
-  peer:
-    limits:
-      cpu: 100m
-      memory: 128Mi
-    requests:
-      cpu: 100m
-      memory: 128Mi
+  peer: {}
   couchdbExporter:
     limits:
       cpu: 300m
@@ -101,13 +101,7 @@ resources:
     requests:
       cpu: 100m
       memory: 64Mi
-  couchdb:
-    limits:
-      cpu: 100m
-      memory: 128Mi
-    requests:
-      cpu: 100m
-      memory: 128Mi
+  couchdb: {}
   chaincode:
     limits:
       cpu: 100m
diff --git a/controllers/ca/ca_controller.go b/controllers/ca/ca_controller.go
index e379e570..d7f9498f 100644
--- a/controllers/ca/ca_controller.go
+++ b/controllers/ca/ca_controller.go
@@ -56,6 +56,8 @@ type FabricCAReconciler struct {
 	Scheme    *runtime.Scheme
 	Config    *rest.Config
 	ClientSet *kubernetes.Clientset
+	Wait      bool
+	Timeout   time.Duration
 }
 
 func parseECDSAPrivateKey(contents []byte) (*ecdsa.PrivateKey, error) {
diff --git a/controllers/mainchannel/mainchannel_controller.go b/controllers/mainchannel/mainchannel_controller.go
index 856ca7d1..4bbfac2a 100644
--- a/controllers/mainchannel/mainchannel_controller.go
+++ b/controllers/mainchannel/mainchannel_controller.go
@@ -1265,6 +1265,10 @@ func updateApplicationChannelConfigTx(currentConfigTX configtx.ConfigTx, newConf
 	if err != nil {
 		return errors.Wrapf(err, "failed to set ACLs")
 	}
+	err = currentConfigTX.Orderer().SetBatchTimeout(newConfigTx.Orderer.BatchTimeout)
+	if err != nil {
+		return errors.Wrapf(err, "failed to set batch timeout")
+	}
 	return nil
 }
 func updateOrdererChannelConfigTx(currentConfigTX configtx.ConfigTx, newConfigTx configtx.Channel) error {
@@ -1387,6 +1391,24 @@ func updateOrdererChannelConfigTx(currentConfigTX configtx.ConfigTx, newConfigTx
 		}
 	}
 
+	err = currentConfigTX.Orderer().BatchSize().SetMaxMessageCount(
+		newConfigTx.Orderer.BatchSize.MaxMessageCount,
+	)
+	if err != nil {
+		return errors.Wrapf(err, "failed to set max message count")
+	}
+	err = currentConfigTX.Orderer().BatchSize().SetAbsoluteMaxBytes(
+		newConfigTx.Orderer.BatchSize.AbsoluteMaxBytes,
+	)
+	if err != nil {
+		return errors.Wrapf(err, "failed to set absolute max bytes")
+	}
+	err = currentConfigTX.Orderer().BatchSize().SetPreferredMaxBytes(
+		newConfigTx.Orderer.BatchSize.PreferredMaxBytes,
+	)
+	if err != nil {
+		return errors.Wrapf(err, "failed to set preferred max bytes")
+	}
 	err = currentConfigTX.Orderer().SetPolicies(
 		newConfigTx.Orderer.Policies,
 	)
diff --git a/controllers/ordnode/ordnode_controller.go b/controllers/ordnode/ordnode_controller.go
index 332ea8ff..1f0db77d 100644
--- a/controllers/ordnode/ordnode_controller.go
+++ b/controllers/ordnode/ordnode_controller.go
@@ -52,6 +52,8 @@ type FabricOrdererNodeReconciler struct {
 	Config                     *rest.Config
 	AutoRenewCertificates      bool
 	AutoRenewCertificatesDelta time.Duration
+	Wait                       bool
+	Timeout                    time.Duration
 }
 
 const ordererNodeFinalizer = "finalizer.orderernode.hlf.kungfusoftware.es"
diff --git a/controllers/peer/peer_controller.go b/controllers/peer/peer_controller.go
index 1b14a0de..39bae84c 100644
--- a/controllers/peer/peer_controller.go
+++ b/controllers/peer/peer_controller.go
@@ -59,6 +59,8 @@ type FabricPeerReconciler struct {
 	Config                     *rest.Config
 	AutoRenewCertificates      bool
 	AutoRenewCertificatesDelta time.Duration
+	Wait                       bool
+	Timeout                    time.Duration
 }
 
 func (r *FabricPeerReconciler) addFinalizer(reqLogger logr.Logger, m *hlfv1alpha1.FabricPeer) error {
@@ -1586,61 +1588,75 @@ func createPeerService(
 			return nil, err
 		}
 	}
-	if exists {
-		return svc, nil
-	}
 	labels := map[string]string{
 		"app":     chartName,
 		"release": releaseName,
 	}
-	svc = &apiv1.Service{
-		ObjectMeta: v1.ObjectMeta{
-			Name:      svcName,
-			Namespace: ns,
-			Labels:    labels,
-		},
-		Spec: corev1.ServiceSpec{
-			Type: peer.Spec.Service.Type,
-			Ports: []corev1.ServicePort{
-				{
-					Name:     PeerPortName,
-					Protocol: "TCP",
-					Port:     7051,
-					TargetPort: intstr.IntOrString{
-						Type:   intstr.Int,
-						IntVal: 7051,
-					},
+	serviceSpec := corev1.ServiceSpec{
+		Type: peer.Spec.Service.Type,
+		Ports: []corev1.ServicePort{
+			{
+				Name:     "peer-443",
+				Protocol: "TCP",
+				Port:     443,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: 7051,
+				},
+			},
+			{
+				Name:     PeerPortName,
+				Protocol: "TCP",
+				Port:     7051,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: 7051,
 				},
-				{
-					Name:     ChaincodePortName,
-					Protocol: "TCP",
-					Port:     7052,
-					TargetPort: intstr.IntOrString{
-						Type:   intstr.Int,
-						IntVal: 7052,
-					},
+			},
+			{
+				Name:     ChaincodePortName,
+				Protocol: "TCP",
+				Port:     7052,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: 7052,
 				},
-				{
-					Name:     EventPortName,
-					Protocol: "TCP",
-					Port:     7053,
-					TargetPort: intstr.IntOrString{
-						Type:   intstr.Int,
-						IntVal: 7053,
-					},
+			},
+			{
+				Name:     EventPortName,
+				Protocol: "TCP",
+				Port:     7053,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: 7053,
 				},
-				{
-					Name:     OperationsPortName,
-					Protocol: "TCP",
-					Port:     9443,
-					TargetPort: intstr.IntOrString{
-						Type:   intstr.Int,
-						IntVal: 9443,
-					},
+			},
+			{
+				Name:     OperationsPortName,
+				Protocol: "TCP",
+				Port:     9443,
+				TargetPort: intstr.IntOrString{
+					Type:   intstr.Int,
+					IntVal: 9443,
 				},
 			},
-			Selector: labels,
 		},
+		Selector: labels,
+	}
+
+	if exists {
+		// update the service
+		svc.Spec = serviceSpec
+		return clientSet.CoreV1().Services(ns).Update(ctx, svc, v1.UpdateOptions{})
+	}
+
+	svc = &apiv1.Service{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      svcName,
+			Namespace: ns,
+			Labels:    labels,
+		},
+		Spec:   serviceSpec,
 		Status: corev1.ServiceStatus{},
 	}
 	return clientSet.CoreV1().Services(ns).Create(ctx, svc, v1.CreateOptions{})
diff --git a/kubectl-hlf/cmd/networkconfig/create.go b/kubectl-hlf/cmd/networkconfig/create.go
index dd07f28a..50531305 100644
--- a/kubectl-hlf/cmd/networkconfig/create.go
+++ b/kubectl-hlf/cmd/networkconfig/create.go
@@ -21,6 +21,7 @@ type CreateOptions struct {
 	Name       string
 	Internal   bool
 	SecretName string
+	Channels   []string
 }
 
 func (o CreateOptions) Validate() error {
@@ -79,12 +80,15 @@ func (c *createCmd) run(args []string) error {
 			Namespace: c.opts.NS,
 		},
 		Spec: hlfv1alpha1.FabricNetworkConfigSpec{
-			Organization:  "",
-			Internal:      c.opts.Internal,
-			Organizations: c.opts.Orgs,
-			Namespaces:    namespaces,
-			SecretName:    secretName,
-			Identities:    identities,
+			Organization:     "",
+			Internal:         c.opts.Internal,
+			Organizations:    c.opts.Orgs,
+			Namespaces:       namespaces,
+			Channels:         c.opts.Channels,
+			Identities:       identities,
+			ExternalOrderers: []hlfv1alpha1.FabricNetworkConfigExternalOrderer{},
+			ExternalPeers:    []hlfv1alpha1.FabricNetworkConfigExternalPeer{},
+			SecretName:       secretName,
 		},
 	}
 	_, err = oclient.HlfV1alpha1().FabricNetworkConfigs(c.opts.NS).Create(
@@ -114,6 +118,7 @@ func newCreateNetworkConfigCmd(out io.Writer, errOut io.Writer) *cobra.Command {
 	}
 	f := cmd.Flags()
 	f.StringSliceVarP(&c.opts.Orgs, "orgs", "o", []string{}, "Organizations to inspect")
+	f.StringSliceVarP(&c.opts.Channels, "channels", "c", []string{}, "Channels to inspect")
 	f.StringVar(&c.opts.Name, "name", "", "Name of the Network Config to create")
 	f.StringVar(&c.opts.SecretName, "secret", "", "Secret name to store the network config")
 	f.StringVarP(&c.opts.NS, "namespace", "n", helpers.DefaultNamespace, "Namespace scope for this request")
diff --git a/main.go b/main.go
index 4df7a5cb..0de435ee 100644
--- a/main.go
+++ b/main.go
@@ -136,12 +136,14 @@ func main() {
 	}
 	if err = (&peer.FabricPeerReconciler{
 		Client:                     mgr.GetClient(),
+		ChartPath:                  peerChartPath,
 		Log:                        ctrl.Log.WithName("controllers").WithName("FabricPeer"),
 		Scheme:                     mgr.GetScheme(),
 		Config:                     mgr.GetConfig(),
-		ChartPath:                  peerChartPath,
 		AutoRenewCertificates:      autoRenewCertificatesPeerEnabled,
 		AutoRenewCertificatesDelta: autoRenewPeerCertificatesDelta,
+		Wait:                       false,
+		Timeout:                    0,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "FabricPeer")
 		os.Exit(1)
@@ -163,6 +165,8 @@ func main() {
 		Config:    mgr.GetConfig(),
 		ClientSet: clientSet,
 		ChartPath: caChartPath,
+		Wait:      false,
+		Timeout:   0,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "FabricCA")
 		os.Exit(1)
@@ -196,6 +200,8 @@ func main() {
 		ChartPath:                  ordNodeChartPath,
 		AutoRenewCertificates:      autoRenewCertificatesOrdererEnabled,
 		AutoRenewCertificatesDelta: autoRenewOrdererCertificatesDelta,
+		Wait:                       false,
+		Timeout:                    0,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "FabricOrdererNode")
 		os.Exit(1)