diff --git a/deploy-metallb/manifests/04-NMS-Operand.yaml b/deploy-metallb/manifests/04-NMS-Operand.yaml
index fef9cf26d..653c21410 100644
--- a/deploy-metallb/manifests/04-NMS-Operand.yaml
+++ b/deploy-metallb/manifests/04-NMS-Operand.yaml
@@ -1,4 +1,4 @@
-apiVersion: nmstate.io/v1beta1
+apiVersion: nmstate.io/v1
 kind: NMState
 metadata:
   name: nmstate
diff --git a/deploy-metallb/manifests/nncp.yaml b/deploy-metallb/manifests/nncp.yaml
index 3efa7dcb9..bee5b33e7 100644
--- a/deploy-metallb/manifests/nncp.yaml
+++ b/deploy-metallb/manifests/nncp.yaml
@@ -1,4 +1,4 @@
-apiVersion: nmstate.io/v1beta1
+apiVersion: nmstate.io/v1
 kind: NodeNetworkConfigurationPolicy
 metadata:
   name: $NODENAME-nncp
diff --git a/deploy-odf/manifests/04-ODF-StorageCluster.yaml b/deploy-odf/manifests/04-ODF-StorageCluster.yaml
index 322ef83a5..a70c777df 100644
--- a/deploy-odf/manifests/04-ODF-StorageCluster.yaml
+++ b/deploy-odf/manifests/04-ODF-StorageCluster.yaml
@@ -25,5 +25,5 @@ spec:
     name: ocs-deviceset
     placement: {}
     portable: False
-    replica: 1
+    replica: 3
     resources: {}
diff --git a/finish-deployment/manifests/nmstate.yaml b/finish-deployment/manifests/nmstate.yaml
index fef9cf26d..653c21410 100644
--- a/finish-deployment/manifests/nmstate.yaml
+++ b/finish-deployment/manifests/nmstate.yaml
@@ -1,4 +1,4 @@
-apiVersion: nmstate.io/v1beta1
+apiVersion: nmstate.io/v1
 kind: NMState
 metadata:
   name: nmstate
diff --git a/finish-deployment/manifests/nncp.yaml b/finish-deployment/manifests/nncp.yaml
index 3efa7dcb9..bee5b33e7 100644
--- a/finish-deployment/manifests/nncp.yaml
+++ b/finish-deployment/manifests/nncp.yaml
@@ -1,4 +1,4 @@
-apiVersion: nmstate.io/v1beta1
+apiVersion: nmstate.io/v1
 kind: NodeNetworkConfigurationPolicy
 metadata:
   name: $NODENAME-nncp