diff --git a/.github/workflows/test-kubectl-plugin.yml b/.github/workflows/test-kubectl-plugin.yml
index e6000247..541acda3 100644
--- a/.github/workflows/test-kubectl-plugin.yml
+++ b/.github/workflows/test-kubectl-plugin.yml
@@ -200,7 +200,7 @@ jobs:
               --type=orderer --enroll-id enroll --enroll-secret=enrollpw --mspid=OrdererMSP
 
           kubectl hlf ordnode create --image=$ORDERER_IMAGE --version=$ORDERER_VERSION \
-              --storage-class=standard --enroll-id=orderer --mspid=OrdererMSP --hosts=orderer0-ord.localho.st \
+              --storage-class=standard --enroll-id=orderer --mspid=OrdererMSP --hosts=orderer0-ord.localho.st --admin-hosts=admin-orderer0-ord.localho.st \
               --enroll-pw=ordererpw --capacity=2Gi --name=ord-node1 --ca-name=ord-ca.default
           kubectl wait --timeout=180s --for=condition=Running fabricorderernodes.hlf.kungfusoftware.es --all
       - name: Prepare Connection string for Orderer Node
@@ -250,7 +250,7 @@ jobs:
               --admin-peer-orgs=Org1MSP \
               --secret-name=wallet \
               --secret-ns=default \
-              --consenters=ord-node1.default:7050 \
+              --consenters=orderer0-ord.localho.st:7050 \
               --consenter-certificates=./orderer-cert.pem \
               --identities="OrdererMSP;admin-tls-ordservice.yaml" \
               --identities="Org1MSP;peer-org1.yaml"
@@ -266,7 +266,7 @@ jobs:
               --mspid=Org1MSP \
               --name="demo-org1msp" \
               --orderer-certificates="./orderer-cert.pem" \
-              --orderer-urls="grpcs://ord-node1.default:7050" \
+              --orderer-urls="grpcs://orderer0-ord.localho.st:7050" \
               --anchor-peers="org1-peer0:7051" \
               --peers="org1-peer0.default" \
               --secret-name=wallet \
diff --git a/kubectl-hlf/cmd/channelcrd/mainchannel/create.go b/kubectl-hlf/cmd/channelcrd/mainchannel/create.go
index c5024524..6e93b253 100644
--- a/kubectl-hlf/cmd/channelcrd/mainchannel/create.go
+++ b/kubectl-hlf/cmd/channelcrd/mainchannel/create.go
@@ -132,12 +132,23 @@ func (o Options) mapToFabricMainChannel() (*v1alpha1.FabricMainChannelSpec, erro
 				AdminPort: adminOrdererPort,
 			})
 		}
+		channelOrdererNodes := []v1alpha1.FabricMainChannelOrdererNode{}
+		for _, ordererNode := range nodes {
+			namespace := ordererNode.Item.Namespace
+			if namespace == "" {
+				namespace = "default"
+			}
+			channelOrdererNodes = append(channelOrdererNodes, v1alpha1.FabricMainChannelOrdererNode{
+				Name:      ordererNode.Item.Name,
+				Namespace: namespace,
+			})
+		}
 		ordererOrganizations = append(ordererOrganizations, v1alpha1.FabricMainChannelOrdererOrganization{
 			MSPID:                  mspID,
 			TLSCACert:              tlsCACert,
 			SignCACert:             signCACert,
 			OrdererEndpoints:       ordererEndpoints,
-			OrderersToJoin:         []v1alpha1.FabricMainChannelOrdererNode{},
+			OrderersToJoin:         channelOrdererNodes,
 			ExternalOrderersToJoin: ordererNodes,
 		})
 	}