diff --git a/charts/oci-service-broker/samples/adw/adw-demo-secret.yaml b/charts/oci-service-broker/samples/adw/adw-demo-secret.yaml
index 498239a..fc63fae 100644
--- a/charts/oci-service-broker/samples/adw/adw-demo-secret.yaml
+++ b/charts/oci-service-broker/samples/adw/adw-demo-secret.yaml
@@ -8,6 +8,6 @@ metadata:
   name: adw-user-cred
 data:
   # "s123456789S@"
-  password: czEyMzQ1Njc4OVNACg==
+  password: czEyMzQ1Njc4OVNA
   # "Welcome_123"
   walletPassword: V2VsY29tZV8xMjMK
\ No newline at end of file
diff --git a/charts/oci-service-broker/samples/adw/adw-demo.yaml b/charts/oci-service-broker/samples/adw/adw-demo.yaml
index 991bcbf..837b6c7 100644
--- a/charts/oci-service-broker/samples/adw/adw-demo.yaml
+++ b/charts/oci-service-broker/samples/adw/adw-demo.yaml
@@ -2,12 +2,15 @@
 # Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: adw-demo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: adw-demo
   template:
     metadata:
       labels:
diff --git a/charts/oci-service-broker/samples/atp/atp-demo-secret.yaml b/charts/oci-service-broker/samples/atp/atp-demo-secret.yaml
index 66780ff..647bb6b 100644
--- a/charts/oci-service-broker/samples/atp/atp-demo-secret.yaml
+++ b/charts/oci-service-broker/samples/atp/atp-demo-secret.yaml
@@ -8,6 +8,6 @@ metadata:
   name: atp-user-cred
 data:
   # "s123456789S@"
-  password: czEyMzQ1Njc4OVNACg==
+  password: czEyMzQ1Njc4OVNA
   # "Welcome_123"
   walletPassword: V2VsY29tZV8xMjMK
\ No newline at end of file
diff --git a/charts/oci-service-broker/samples/atp/atp-demo.yaml b/charts/oci-service-broker/samples/atp/atp-demo.yaml
index c54a6bc..c347c96 100644
--- a/charts/oci-service-broker/samples/atp/atp-demo.yaml
+++ b/charts/oci-service-broker/samples/atp/atp-demo.yaml
@@ -2,12 +2,15 @@
 # Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: atp-demo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: atp-demo
   template:
     metadata:
       labels:
@@ -32,7 +35,7 @@ spec:
       containers:
       # User application that uses credential files to connect to ATP.
       - name: db-app
-        image: <USER_APPLICATION_IMAGE>
+        image: USER_APPLICATION_IMAGE
         env:
         # Pass DB ADMIN user name that is part of the secret created by the binding request.
         - name: DB_ADMIN_USER
diff --git a/charts/oci-service-broker/samples/atp/atp-existing-instance.yaml b/charts/oci-service-broker/samples/atp/atp-existing-instance.yaml
index 7d22f06..d4629da 100644
--- a/charts/oci-service-broker/samples/atp/atp-existing-instance.yaml
+++ b/charts/oci-service-broker/samples/atp/atp-existing-instance.yaml
@@ -11,6 +11,6 @@ spec:
   clusterServicePlanExternalName: standard
   parameters:
     name: osb-atp-existing-instance
-    ocid: "CHANGE_EXISTING_SERVICEINSTANCE_OCID_HERE"
-    compartmentId: "CHANGE_COMPARTMENT_OCID_HERE"
+    ocid: CHANGE_EXISTING_SERVICEINSTANCE_OCID_HERE
+    compartmentId: CHANGE_COMPARTMENT_OCID_HERE
     provisioning: false
diff --git a/charts/oci-service-broker/samples/network-policy/allow-all-pods-from-namespace.yaml b/charts/oci-service-broker/samples/network-policy/allow-all-pods-from-namespace.yaml
index 2c0eed9..390ec10 100644
--- a/charts/oci-service-broker/samples/network-policy/allow-all-pods-from-namespace.yaml
+++ b/charts/oci-service-broker/samples/network-policy/allow-all-pods-from-namespace.yaml
@@ -3,7 +3,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
 # Allow access to OCI Service Broker from "any" pods running in the namespace that
-# contians label "app=service-catalog".
+# contains label "app=service-catalog".
 kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
diff --git a/charts/oci-service-broker/samples/objectstore/create-bucket.yaml b/charts/oci-service-broker/samples/objectstore/create-bucket.yaml
index 85e7ea7..b2ff429 100644
--- a/charts/oci-service-broker/samples/objectstore/create-bucket.yaml
+++ b/charts/oci-service-broker/samples/objectstore/create-bucket.yaml
@@ -6,6 +6,7 @@ apiVersion: servicecatalog.k8s.io/v1beta1
 kind: ServiceInstance
 metadata:
  name: testbucket
+ namespace: default
 spec:
  clusterServiceClassExternalName: object-store-service
  clusterServicePlanExternalName: standard
diff --git a/charts/oci-service-broker/samples/objectstore/create-existing-bucket.yaml b/charts/oci-service-broker/samples/objectstore/create-existing-bucket.yaml
index 1708265..2188890 100644
--- a/charts/oci-service-broker/samples/objectstore/create-existing-bucket.yaml
+++ b/charts/oci-service-broker/samples/objectstore/create-existing-bucket.yaml
@@ -5,11 +5,11 @@
 apiVersion: servicecatalog.k8s.io/v1beta1
 kind: ServiceInstance
 metadata:
-  name: "CHANGE_EXISTING_BUCKETNAME_HERE"
+  name: CHANGE_EXISTING_BUCKETNAME_HERE
 spec:
  clusterServiceClassExternalName: object-store-service
  clusterServicePlanExternalName: standard
  parameters:
-   name: "CHANGE_EXISTING_BUCKETNAME_HERE"
-   namespace: "CHANGE_NAMESPACE_HERE"
+   name: CHANGE_EXISTING_BUCKETNAME_HERE
+   namespace: CHANGE_NAMESPACE_HERE
    provisioning: false
diff --git a/charts/oci-service-broker/samples/oss/create-oss-instance.yaml b/charts/oci-service-broker/samples/oss/create-oss-instance.yaml
index ffa2b31..c150bb6 100644
--- a/charts/oci-service-broker/samples/oss/create-oss-instance.yaml
+++ b/charts/oci-service-broker/samples/oss/create-oss-instance.yaml
@@ -13,5 +13,5 @@ spec:
    name: teststream
    compartmentId: CHANGE_COMPARTMENT_OCID_HERE
    partitions: CHANGE_PARTITION_COUNT_HERE
-# Use streampoolId for creating stream associated with a streampool. Do not use compartmentId when using streampoolId
+#   Use streampoolId for creating stream associated with a streampool. 
 #   streampoolId: CHANGE_STREAM_POOL_OCID_HERE