diff --git a/grafana.integreatly.org/grafanadashboard_v1beta1.json b/grafana.integreatly.org/grafanadashboard_v1beta1.json
index 2f233055..7f45a3eb 100644
--- a/grafana.integreatly.org/grafanadashboard_v1beta1.json
+++ b/grafana.integreatly.org/grafanadashboard_v1beta1.json
@@ -167,6 +167,12 @@
         "folder": {
           "type": "string"
         },
+        "folderRef": {
+          "type": "string"
+        },
+        "folderUID": {
+          "type": "string"
+        },
         "grafanaCom": {
           "properties": {
             "id": {
@@ -275,6 +281,15 @@
         "resyncPeriod": {
           "type": "string"
         },
+        "uid": {
+          "type": "string",
+          "x-kubernetes-validations": [
+            {
+              "message": "spec.uid is immutable",
+              "rule": "self == oldSelf"
+            }
+          ]
+        },
         "url": {
           "type": "string"
         }
diff --git a/grafana.integreatly.org/grafanafolder_v1beta1.json b/grafana.integreatly.org/grafanafolder_v1beta1.json
index a7e96d1e..9d5fb9c4 100644
--- a/grafana.integreatly.org/grafanafolder_v1beta1.json
+++ b/grafana.integreatly.org/grafanafolder_v1beta1.json
@@ -60,6 +60,15 @@
         },
         "title": {
           "type": "string"
+        },
+        "uid": {
+          "type": "string",
+          "x-kubernetes-validations": [
+            {
+              "message": "spec.uid is immutable",
+              "rule": "self == oldSelf"
+            }
+          ]
         }
       },
       "required": [