diff --git a/config/samples/_v1beta1_context.yaml b/config/samples/_v1beta1_context.yaml
index 20c8828..4bb7aba 100644
--- a/config/samples/_v1beta1_context.yaml
+++ b/config/samples/_v1beta1_context.yaml
@@ -6,16 +6,23 @@ spec:
   name: test
   space: space-sample
   attachments:
-    - stack: stack-sample
+    - { stack: stack-sample }
   environment:
     - id: foo
       value: bar
       description: "insecure"
     - id: bar
       valueFromSecret:
-        name: test-secret
+        name: secret-sample
         key: test-value
       description: "secure"
   mountedFiles:
     - id: bar
       value: Zm9vCg==
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret-sample
+data:
+  test-value: c2VjcmV0IHN0cmluZwo=
diff --git a/config/samples/_v1beta1_policy.yaml b/config/samples/_v1beta1_policy.yaml
index d0f1f97..4b33b5f 100644
--- a/config/samples/_v1beta1_policy.yaml
+++ b/config/samples/_v1beta1_policy.yaml
@@ -6,9 +6,9 @@ spec:
   name: test policy
   type: PLAN
   spaceName: space-sample
+  description: Prevent creation of IAM users test
   attachedStacks:
     - stack-sample
-  description: Prevent creation of IAM users test
   body: |
     package spacelift
 
diff --git a/config/samples/_v1beta1_run.yaml b/config/samples/_v1beta1_run.yaml
index 48612d9..62f75ca 100644
--- a/config/samples/_v1beta1_run.yaml
+++ b/config/samples/_v1beta1_run.yaml
@@ -1,12 +1,6 @@
 apiVersion: app.spacelift.io/v1beta1
 kind: Run
 metadata:
-  labels:
-    app.kubernetes.io/name: run
-    app.kubernetes.io/instance: run-sample
-    app.kubernetes.io/part-of: spacelift-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: spacelift-operator
   name: run-sample
 spec:
   stackName: stack-sample
diff --git a/config/samples/_v1beta1_space.yaml b/config/samples/_v1beta1_space.yaml
index 53348bb..b213585 100644
--- a/config/samples/_v1beta1_space.yaml
+++ b/config/samples/_v1beta1_space.yaml
@@ -3,8 +3,5 @@ kind: Space
 metadata:
   name: space-sample
 spec:
-  name: created from operator
+  name: my test space
   parentSpace: root
-  inheritEntities: false
-  description: "This space was created from an operator"
-  labels: ["one", "two"]
diff --git a/config/samples/_v1beta1_stack.yaml b/config/samples/_v1beta1_stack.yaml
index ee644f1..d85138d 100644
--- a/config/samples/_v1beta1_stack.yaml
+++ b/config/samples/_v1beta1_stack.yaml
@@ -3,10 +3,9 @@ kind: Stack
 metadata:
   name: stack-sample
 spec:
-  name: spacelift-operator-stack
-  spaceName: space-sample
+  name: spacelift operator stack
   settings:
+    spaceName: space-sample
     administrative: false
     branch: main
     repository: ORG/REPO_NAME
-