diff --git a/vaadin-bom/pom.xml b/vaadin-bom/pom.xml
index 6c91b1061..df766b4cd 100644
--- a/vaadin-bom/pom.xml
+++ b/vaadin-bom/pom.xml
@@ -16,7 +16,7 @@
   <url>http://vaadin.com</url>
 
   <properties>
-    <flow.version>1.0.0.alpha10</flow.version>
+    <flow.version>1.0.0.alpha11</flow.version>
     <testbench.version>6.0.0.alpha1</testbench.version>
     <board.version>1.1.0</board.version>
     <charts.version>6.0.0</charts.version>
@@ -90,18 +90,84 @@
       <!-- Free Components -->
       <dependency>
         <groupId>com.vaadin</groupId>
-        <artifactId>flow-components</artifactId>
+        <artifactId>flow-generated-components</artifactId>
         <version>${flow.version}</version>
       </dependency>
       <dependency>
         <groupId>com.vaadin</groupId>
-        <artifactId>flow-generated-components</artifactId>
+        <artifactId>flow-html-components</artifactId>
         <version>${flow.version}</version>
       </dependency>
+
       <dependency>
         <groupId>com.vaadin</groupId>
-        <artifactId>flow-html-components</artifactId>
-        <version>${flow.version}</version>
+        <artifactId>vaadin-button-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-checkbox-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-combo-box-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-date-picker-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-dialog-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-form-layout-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-grid-flow</artifactId>
+        <version>1.0.0.alpha1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-icons-flow</artifactId>
+        <version>1.0.0.alpha3</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-ordered-layout-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-progress-bar-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-split-layout-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-tabs-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-text-field-flow</artifactId>
+        <version>1.0.0.alpha2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-upload-flow</artifactId>
+        <version>1.0.0.alpha2</version>
       </dependency>
 
       <!-- TestBench -->
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index 86de3fce2..fca2e11a9 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -77,15 +77,69 @@
     <!-- Free Components -->
     <dependency>
       <groupId>com.vaadin</groupId>
-      <artifactId>flow-components</artifactId>
+      <artifactId>flow-generated-components</artifactId>
     </dependency>
     <dependency>
       <groupId>com.vaadin</groupId>
-      <artifactId>flow-generated-components</artifactId>
+      <artifactId>flow-html-components</artifactId>
     </dependency>
+
     <dependency>
       <groupId>com.vaadin</groupId>
-      <artifactId>flow-html-components</artifactId>
+      <artifactId>vaadin-button-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-checkbox-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-combo-box-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-date-picker-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-dialog-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-form-layout-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-grid-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-icons-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-ordered-layout-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-progress-bar-flow</artifactId>
+      <version>1.0.0.alpha2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-split-layout-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-tabs-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-text-field-flow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-upload-flow</artifactId>
     </dependency>
 
     <!-- TestBench must be included in the project separately to get a test scope -->