diff --git a/generator/schemas/gen.go b/generator/schemas/gen.go
index 49a53bd4d..8261be602 100644
--- a/generator/schemas/gen.go
+++ b/generator/schemas/gen.go
@@ -35,10 +35,10 @@ import (
 // GenerateJSONSchema drives whether a Json schema should be generated from this GO Struct type
 type GenerateJSONSchema struct {
 
-	// OmitCustomUnionMembers indicates that the Json schema gnerated from this type should omit Custom component union members.
+	// OmitCustomUnionMembers indicates that the Json schema generated from this type should omit Custom union members.
 	OmitCustomUnionMembers bool `marker:",optional"`
 
-	// OmitPluginUnionMembers indicates that the Json schema gnerated from this type should omit Plugin component union members.
+	// OmitPluginUnionMembers indicates that the Json schema generated from this type should omit Plugin component union members.
 	OmitPluginUnionMembers bool `marker:",optional"`
 
 	// Title indicates the content ot the Json Schema `title` attribute
diff --git a/generator/schemas/zz_generated.markerhelp.go b/generator/schemas/zz_generated.markerhelp.go
index f1121a022..f94003278 100644
--- a/generator/schemas/zz_generated.markerhelp.go
+++ b/generator/schemas/zz_generated.markerhelp.go
@@ -19,11 +19,11 @@ func (GenerateJSONSchema) Help() *markers.DefinitionHelp {
 		},
 		FieldHelp: map[string]markers.DetailedHelp{
 			"OmitCustomUnionMembers": markers.DetailedHelp{
-				Summary: "indicates that the Json schema gnerated from this type should omit Custom component union members.",
+				Summary: "indicates that the Json schema generated from this type should omit Custom union members.",
 				Details: "",
 			},
 			"OmitPluginUnionMembers": markers.DetailedHelp{
-				Summary: "indicates that the Json schema gnerated from this type should omit Plugin component union members.",
+				Summary: "indicates that the Json schema generated from this type should omit Plugin component union members.",
 				Details: "",
 			},
 			"Title": markers.DetailedHelp{
diff --git a/samples/devfiles/job-apply-example.devfile.yaml b/samples/devfiles/job-apply-example.devfile.yaml
index 68530a54f..40a88a6da 100644
--- a/samples/devfiles/job-apply-example.devfile.yaml
+++ b/samples/devfiles/job-apply-example.devfile.yaml
@@ -19,12 +19,6 @@ components:
                 command: ["some",  "command", "with", "parameters"]
               restartPolicy: Never
           backoffLimit: 4
-  - name: go-support
-    plugin:
-      id: ms-vscode/go/latest
-  - name: editor
-    plugin:
-      id: eclipse/che-theia/latest
 commands:
   - id: cleanup-job
     apply:
diff --git a/samples/devfiles/nodejs-stack.devfile.yaml b/samples/devfiles/nodejs-stack.devfile.yaml
index 81aa65d81..fab92447f 100644
--- a/samples/devfiles/nodejs-stack.devfile.yaml
+++ b/samples/devfiles/nodejs-stack.devfile.yaml
@@ -7,19 +7,6 @@ projects:
       remotes:
         origin: "https://github.com/che-samples/web-nodejs-sample.git"
 components:
-  - name: editor
-    plugin:
-      id: eclipse/che-theia/7.1.0
-  - name: terminal
-    plugin:
-      id: eclipse/che-machine-exec-plugin/7.1.0
-  - name: typescript-plugin
-    plugin:
-      id: che-incubator/typescript/1.30.2
-      components:
-        - name: "somename"
-          container:
-            memoryLimit: 512Mi
   - name: nodejs
     container:
       image: quay.io/eclipse/che-nodejs10-ubi:nightly
diff --git a/samples/devfiles/sample-devfile.yaml b/samples/devfiles/sample-devfile.yaml
index a18fc9984..7f4e50462 100644
--- a/samples/devfiles/sample-devfile.yaml
+++ b/samples/devfiles/sample-devfile.yaml
@@ -11,20 +11,6 @@ projects:
         revision: "main"
         remote: origin
 components:
-  - name: editor
-    attributes:
-      kjkh: "128M"
-      kjhkjh:
-        "": ""
-    plugin:
-      id: eclipse/che-theia/latest
-  - name: "ownplugin"
-    plugin:
-      id: acme/newPlugin/latest
-      registryUrl: "https://acme.com/registry/"
-  - name: "myplugin"
-    plugin:
-      uri: "https://github.com/johndoe/che-plugins/blob/master/cool-plugin/0.0.1/meta.yaml"
   - name: "mycontainer"
     container:
       image: "busybox"
diff --git a/samples/devfiles/simple-devfile.yaml b/samples/devfiles/simple-devfile.yaml
index b8c4446ec..c671bcbae 100644
--- a/samples/devfiles/simple-devfile.yaml
+++ b/samples/devfiles/simple-devfile.yaml
@@ -34,16 +34,6 @@ events:
   postStart:
     - "build-schema-and-open-devfile"
 components:
-  - name: yaml-support
-    plugin:
-      id: redhat/vscode-yaml/latest
-  - name: go-support
-    plugin:
-      id: ms-vscode/go/latest
-  - name: editor
-    plugin:
-      id: eclipse/che-theia/latest
-      registryUrl: "external-registry-url"
   - name: "build-tools"
     container:
       image: some container image with required build tools
diff --git a/samples/devfiles/spring-boot-http-booster-devfile.yaml b/samples/devfiles/spring-boot-http-booster-devfile.yaml
index 1a816e35a..693b91bae 100644
--- a/samples/devfiles/spring-boot-http-booster-devfile.yaml
+++ b/samples/devfiles/spring-boot-http-booster-devfile.yaml
@@ -11,20 +11,7 @@ projects:
       checkoutFrom:
         revision: master
 components:
-  - name: java-support
-    plugin:
-      id: redhat/java8/latest
-      components:
-        - name: vscode-java            
-          container:
-            memoryLimit: 2Gi
-        - name: m2
-          volume:
-            size: 2G
-  - name: dependency-analytics
-    plugin:
-      id: redhat/dependency-analytics/latest
-  - name: maven-tooling
+  - name: maven
     container:
       image: registry.redhat.io/codeready-workspaces/stacks-java-rhel8:2.1
       mountSources: true
@@ -45,6 +32,9 @@ components:
       volumeMounts:
         - name: m2
           path: /home/jboss/.m2
+  - name: m2
+    volume:
+      size: 2G
 commands:
   - id: build 
     exec:
diff --git a/test/v200/devfiles/components/pluginAll.yaml b/test/v200/devfiles/components/pluginAll.yaml
deleted file mode 100644
index d21608b9a..000000000
--- a/test/v200/devfiles/components/pluginAll.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-  - name: "testpluginid"
-    plugin:
-      id: testplugin1
-      registryUrl: test-url
-      components:
-        - name: "testcontainers"
-          container:
-            image: testImage
-        - name: "testkubernetes"
-          kubernetes:
-            inlined: testInlined
-          kubernetes:
-            uri: test-uri
-        - name: "testopenshift"
-          openshift:
-            inlined: testInlined
-          openshift:
-            uri: test-uri
-        - name: "testvolume"
-          volume:
-            size: 2G
-      commands:
-        - id: "testapply"
-          apply:
-            component: api-testing
-        - id: "testexec"
-          exec:
-            commandLine: 'echo "Hello ${GREETING} ${USER}"'
-            component: api-tests
-        - id: "testcomposite"
-          composite:
-              group:
-                kind: test
-  - name: "testpluginkube"
-    plugin:
-      kubernetes:
-        name: test-kubernetes
-        namespace: test-namespace
-      registryUrl: test-url
-  - name: "testpluginuri"
-    plugin:
-      uri: test-uri
-      registryUrl: test-url
diff --git a/test/v200/devfiles/components/pluginContainsPlugin.yaml b/test/v200/devfiles/components/pluginContainsPlugin.yaml
deleted file mode 100644
index 17e7ccc54..000000000
--- a/test/v200/devfiles/components/pluginContainsPlugin.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-  - name: "testplugins"
-    plugin:
-      id: test-plugin1
-      registryUrl: test-url
-      components:
-        - name: "testplugin"
-          plugin:
-            id: testPlugin
diff --git a/test/v200/devfiles/components/pluginIdAndKubernetes.yaml b/test/v200/devfiles/components/pluginIdAndKubernetes.yaml
deleted file mode 100644
index 9d1a7faef..000000000
--- a/test/v200/devfiles/components/pluginIdAndKubernetes.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-  - name: "testplugin"
-    plugin:
-      id: test-plugin1
-      kubernetes: test-kubernetes
diff --git a/test/v200/devfiles/components/pluginIdAndUri.yaml b/test/v200/devfiles/components/pluginIdAndUri.yaml
deleted file mode 100644
index c0cf69f9e..000000000
--- a/test/v200/devfiles/components/pluginIdAndUri.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-  - name: "testplugin"
-    plugin:
-      id: test-plugin1
-      uri: test-uri
diff --git a/test/v200/devfiles/components/pluginMinimum.yaml b/test/v200/devfiles/components/pluginMinimum.yaml
deleted file mode 100644
index 528f345fa..000000000
--- a/test/v200/devfiles/components/pluginMinimum.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-  - name: "testpluginid"
-    plugin:
-      id: test-plugin1
-  - name: "testpluginuri"    
-    plugin:
-      uri: test-uri
-  - name: "testpluginkubernetes"  
-    plugin:
-      kubernetes: 
-        name: test-kubernetes
diff --git a/test/v200/devfiles/components/pluginMissingIdUriAndKubernetes.yaml b/test/v200/devfiles/components/pluginMissingIdUriAndKubernetes.yaml
deleted file mode 100644
index 8a18a9c4d..000000000
--- a/test/v200/devfiles/components/pluginMissingIdUriAndKubernetes.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-  - name: "testplugin"
-    plugin:
-      registryUrl: test-url
diff --git a/test/v200/devfiles/components/pluginMixedCaseName.yaml b/test/v200/devfiles/components/pluginMixedCaseName.yaml
deleted file mode 100644
index d87725584..000000000
--- a/test/v200/devfiles/components/pluginMixedCaseName.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-  - name: "testPluginid"
-    plugin:
-      id: test-plugin1
diff --git a/test/v200/devfiles/components/pluginNoName.yaml b/test/v200/devfiles/components/pluginNoName.yaml
deleted file mode 100644
index b90ed9f7b..000000000
--- a/test/v200/devfiles/components/pluginNoName.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-  - plugin:
-      id: test-plugin1
diff --git a/test/v200/devfiles/components/pluginUriAndKubernetes.yaml b/test/v200/devfiles/components/pluginUriAndKubernetes.yaml
deleted file mode 100644
index 29c64983c..000000000
--- a/test/v200/devfiles/components/pluginUriAndKubernetes.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-  - name: "testplugin"
-    plugin:
-      kubernetes: test-kubernetes
-      uri: test-uri
diff --git a/test/v200/json/component-parent-tests.json b/test/v200/json/component-parent-tests.json
index 3c58e2ac1..bf85813a9 100644
--- a/test/v200/json/component-parent-tests.json
+++ b/test/v200/json/component-parent-tests.json
@@ -231,60 +231,6 @@
             "Files": ["devfiles/components/componentStart.yaml",
                         "devfiles/components/openshiftBothInlinedAndUri.yaml"] 
         },
-        { 
-            "FileName" : "componentPluginAll.yaml",
-            "ExpectOutcome" : "PASS",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginAll.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginMinimum.yaml",
-            "ExpectOutcome" : "PASS",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginMinimum.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginNoName.yaml",
-            "ExpectOutcome" : "missing properties: \"name\"",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginNoName.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginMixedCaseName.yaml",
-            "ExpectOutcome" : "does not match pattern",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginMixedCaseName.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginContainsPlugin.yaml",
-            "ExpectOutcome" : "oneOf failed",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginContainsPlugin.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginIdAndKubernetes.yaml",
-            "ExpectOutcome" : "valid against schemas at indexes 1 and 2",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginIdAndKubernetes.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginIdAndUri.yaml",
-            "ExpectOutcome" : "valid against schemas at indexes 0 and 1",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginIdAndUri.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginUriAndKubernetes.yaml",
-            "ExpectOutcome" : "valid against schemas at indexes 0 and 2",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginUriAndKubernetes.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginMissingIdUriAndKubernetes.yaml",
-            "ExpectOutcome" : "oneOf failed",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginMissingIdUriAndKubernetes.yaml"] 
-        },
         { 
             "FileName" : "componentVolumeAll",
             "ExpectOutcome" : "PASS",
diff --git a/test/v200/json/component-tests.json b/test/v200/json/component-tests.json
index 53404d78b..4fa8349f4 100644
--- a/test/v200/json/component-tests.json
+++ b/test/v200/json/component-tests.json
@@ -261,60 +261,6 @@
             "Files": ["devfiles/components/componentStart.yaml",
                         "devfiles/components/openshiftBothInlinedAndUri.yaml"] 
         },
-        { 
-            "FileName" : "componentPluginAll.yaml",
-            "ExpectOutcome" : "PASS",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginAll.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginMinimum.yaml",
-            "ExpectOutcome" : "PASS",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginMinimum.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginNoName.yaml",
-            "ExpectOutcome" : "missing properties: \"name\"",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginNoName.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginMixedCaseName.yaml",
-            "ExpectOutcome" : "does not match pattern",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginMixedCaseName.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginContainsPlugin.yaml",
-            "ExpectOutcome" : "oneOf failed",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginContainsPlugin.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginIdAndKubernetes.yaml",
-            "ExpectOutcome" : "valid against schemas at indexes 1 and 2",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginIdAndKubernetes.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginIdAndUri.yaml",
-            "ExpectOutcome" : "valid against schemas at indexes 0 and 1",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginIdAndUri.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginUriAndKubernetes.yaml",
-            "ExpectOutcome" : "valid against schemas at indexes 0 and 2",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginUriAndKubernetes.yaml"] 
-        },
-        { 
-            "FileName" : "componentPluginMissingIdUriAndKubernetes.yaml",
-            "ExpectOutcome" : "oneOf failed",
-            "Files": ["devfiles/components/componentStart.yaml",
-                        "devfiles/components/pluginMissingIdUriAndKubernetes.yaml"] 
-        },
         { 
             "FileName" : "componentVolumeAll",
             "ExpectOutcome" : "PASS",