diff --git a/dashboard/src/app/factories/load-factory/load-factory.controller.ts b/dashboard/src/app/factories/load-factory/load-factory.controller.ts
index 53120dcaba..2e2a6c843d 100644
--- a/dashboard/src/app/factories/load-factory/load-factory.controller.ts
+++ b/dashboard/src/app/factories/load-factory/load-factory.controller.ts
@@ -142,7 +142,7 @@ export class LoadFactoryController {
   processFactorySource(): void {
     if (this.factory.source) {
       let sourceString = this.factory.source === 'repo' ?
-                   ': .devfile not found in repository root. Default environment will be applied' :
+                   ': devfile.yaml not found in repository root. Default environment will be applied' :
                    ': found " + this.factory.source + ", applying it';
       this.getLoadingSteps()[this.getCurrentProgressStep()].text += sourceString;
     }
diff --git a/.devfile b/devfile.yaml
similarity index 100%
rename from .devfile
rename to devfile.yaml
diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/src/main/java/org/eclipse/che/plugin/github/factory/resolver/GithubURLParser.java b/plugins/plugin-github/che-plugin-github-factory-resolver/src/main/java/org/eclipse/che/plugin/github/factory/resolver/GithubURLParser.java
index a416d82422..6fa073985a 100644
--- a/plugins/plugin-github/che-plugin-github-factory-resolver/src/main/java/org/eclipse/che/plugin/github/factory/resolver/GithubURLParser.java
+++ b/plugins/plugin-github/che-plugin-github-factory-resolver/src/main/java/org/eclipse/che/plugin/github/factory/resolver/GithubURLParser.java
@@ -90,7 +90,7 @@ public class GithubURLParser {
         .withRepository(repoName)
         .withBranch(branchName)
         .withSubfolder(matcher.group("subFolder"))
-        .withDevfileFilename(".devfile")
+        .withDevfileFilename("devfile.yaml")
         .withFactoryFilename(".factory.json");
   }
 }
diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java b/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java
index fb128935e0..a9eb0c1c73 100644
--- a/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java
+++ b/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java
@@ -182,9 +182,9 @@ public class GithubFactoryParametersResolverTest {
     verify(urlFactoryBuilder).createFactoryFromDevfile(factoryUrlArgumentCaptor.capture(), any());
     assertEquals(
         factoryUrlArgumentCaptor.getValue().devfileFileLocation(),
-        "https://raw.githubusercontent.com/eclipse/che/master/.devfile");
+        "https://raw.githubusercontent.com/eclipse/che/master/devfile.yaml");
 
-    assertEquals(factoryUrlArgumentCaptor.getValue().getDevfileFilename(), ".devfile");
+    assertEquals(factoryUrlArgumentCaptor.getValue().getDevfileFilename(), "devfile.yaml");
     // check project config built
     verify(projectConfigDtoMerger)
         .merge(any(FactoryDto.class), projectConfigDtoArgumentCaptor.capture());
diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubUrlTest.java b/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubUrlTest.java
index bc0189583c..a9d9331a02 100644
--- a/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubUrlTest.java
+++ b/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubUrlTest.java
@@ -41,12 +41,12 @@ public class GithubUrlTest {
     assertNotNull(this.githubUrl);
   }
 
-  /** Check when there is .devfile in the repository */
+  /** Check when there is devfile in the repository */
   @Test
   public void checkDevfileLocation() {
     assertEquals(
         githubUrl.devfileFileLocation(),
-        "https://raw.githubusercontent.com/eclipse/che/master/.devfile");
+        "https://raw.githubusercontent.com/eclipse/che/master/devfile.yaml");
   }
 
   /** Check when there is .factory.json file in the repository */
diff --git a/wsmaster/che-core-api-devfile/README.md b/wsmaster/che-core-api-devfile/README.md
index 2479359217..d951971407 100644
--- a/wsmaster/che-core-api-devfile/README.md
+++ b/wsmaster/che-core-api-devfile/README.md
@@ -42,7 +42,7 @@ For the detailed explanation of all devfile components assignment and possible v
 
 ### Getting Started
 The simplest way to use devfile is to have it deployed into GitHub source repository and then create factory from this repo.
-This is as simple as create `.devfile` file in the root of your GH repo, and then execute the factory: 
+This is as simple as create `devfile.yaml` file in the root of your GH repo, and then execute the factory: 
 ```
 https://<your-che-host>/f?url=https://github.com/mygroup/myrepo
 ```
@@ -59,7 +59,7 @@ curl -X POST  -H "Authorization: <TOKEN>" -H "Content-Type: application/yaml" -d
 If you're a user of `chectl` tool, it is also possible to execute workspace from devfile, using `workspace:start` command 
 parameter as follows:
 ```
-chectl workspace:start --devfile=.devfile
+chectl workspace:start --devfile=devfile.yaml
 ```` 
 Please note that currently this way only works for the local (same machine) devfiles - URL can't be used here atm.
 
@@ -220,10 +220,10 @@ Devfile allows to specify commands set to be available for execution in workspac
 
 ### Live working examples
 
-  - [NodeJS simple "Hello World" example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/web-nodejs-sample/devfile.yml)
-  - [NodeJS Application with Mongo DB example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/web-nodejs-with-db-sample/devfile.yml)
-  - [Java Spring-Petclinic example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/web-java-spring-petclinic/devfile.yml)
-  - [Theia frontend plugin example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/theia-hello-world-frontend-plugin/devfile.yml)
+  - [NodeJS simple "Hello World" example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/web-nodejs-sample/devfile.yaml)
+  - [NodeJS Application with Mongo DB example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/web-nodejs-with-db-sample/devfile.yaml)
+  - [Java Spring-Petclinic example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/web-java-spring-petclinic/devfile.yaml)
+  - [Theia frontend plugin example](https://che.openshift.io/f?url=https://raw.githubusercontent.com/redhat-developer/devfile/master/samples/theia-hello-world-frontend-plugin/devfile.yaml)
 
 ### Planned features
 There is still a lot of plans to extend Devfile possibilities, such as support multiple dockerimage components etc