diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..5ce342c
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">8</size>
+    </disk>
+  </hardware>
+  <hostlabel>LARGE_CACHE</hostlabel>
+</constraints>
+
diff --git a/defaults-repositories.include b/defaults-repositories.include
new file mode 100644
index 0000000..ac2cdef
--- /dev/null
+++ b/defaults-repositories.include
@@ -0,0 +1,4 @@
+<!-- This follows the project's repositories by default -->
+<repositories>
+  <repository path="obsrepositories:/" />
+</repositories>
diff --git a/groups.yml b/groups.yml
index c59d1e2..7ce321a 100644
--- a/groups.yml
+++ b/groups.yml
@@ -20,6 +20,176 @@ dvd:
   - openSUSE-Tumbleweed-Kubic-release: [locked]
   - openSUSE-release
   - openSUSE-release-dvd
+  - patterns-gnome-gnome: [suggested]
+  - patterns-gnome-gnome_basis: [suggested]
+  - patterns-gnome-gnome_basis_opt: [suggested]
+  - patterns-gnome-gnome_games: [suggested]
+  - patterns-gnome-gnome_ide: [suggested]
+  - patterns-gnome-gnome_imaging: [suggested]
+  - patterns-gnome-gnome_internet: [suggested]
+  - patterns-gnome-gnome_multimedia: [suggested]
+  - patterns-gnome-gnome_office: [suggested]
+  - patterns-gnome-gnome_utilities: [suggested]
+  - patterns-gnome-gnome_yast: [suggested]
+  - patterns-desktop-imaging: [suggested]
+  - patterns-desktop-imaging_opt: [suggested]
+  - patterns-kde-kde: [suggested]
+  - patterns-kde-kde_edutainment: [suggested]
+  - patterns-kde-kde_games: [suggested]
+  - patterns-kde-kde_ide: [suggested]
+  - patterns-kde-kde_imaging: [suggested]
+  - patterns-kde-kde_internet: [suggested]
+  - patterns-kde-kde_multimedia: [suggested]
+  - patterns-kde-kde_office: [suggested]
+  - patterns-kde-kde_plasma: [suggested]
+  - patterns-kde-kde_utilities: [suggested]
+  - patterns-kde-kde_utilities_opt: [suggested]
+  - patterns-kde-kde_yast: [suggested]
+  - patterns-base-apparmor: [suggested]
+  - patterns-base-apparmor_opt: [suggested]
+  - patterns-base-base: [suggested]
+  - patterns-base-console: [suggested]
+  - patterns-devel-C-C++-devel_C_C++: [suggested]
+  - patterns-devel-base-devel_basis: [suggested]
+  - patterns-devel-base-devel_kernel: [suggested]
+  - patterns-devel-osc-devel_osc_build: [suggested]
+  - patterns-devel-perl-devel_perl: [suggested]
+  - patterns-devel-base-devel_rpm_build: [suggested]
+  - patterns-devel-ruby-devel_ruby: [suggested]
+  - patterns-devel-base-devel_web: [suggested]
+  - patterns-server-dhcp_dns_server: [suggested]
+  - patterns-server-directory_server: [suggested]
+  - patterns-base-enhanced_base: [suggested]
+  - patterns-base-enhanced_base_opt: [suggested]
+  - patterns-server-file_server: [suggested]
+  - patterns-fonts-fonts: [suggested]
+  - patterns-fonts-fonts_opt: [suggested]
+  - patterns-games-games: [suggested]
+  - patterns-server-lamp_server: [suggested]
+  - patterns-desktop-laptop: [suggested]
+  - patterns-lxde-lxde: [suggested]
+  - patterns-lxde-lxde_laptop: [suggested]
+  - patterns-server-mail_server: [suggested]
+  - patterns-desktop-multimedia: [suggested]
+  - patterns-desktop-multimedia_opt: [suggested]
+  - patterns-network-network_admin: [suggested]
+  - patterns-office-office: [suggested]
+  - patterns-server-printing: [suggested]
+  - patterns-media-rest_cd_core: [suggested]
+  - patterns-base-sw_management: [suggested]
+  - patterns-gnome-sw_management_gnome: [suggested]
+  - patterns-desktop-technical_writing: [suggested]
+  - patterns-base-transactional_base: [suggested]
+  - patterns-base-x11: [suggested]
+  - patterns-base-x11_opt: [suggested]
+  - patterns-xfce-xfce: [suggested]
+  - patterns-xfce-xfce_basis: [suggested]
+  - patterns-xfce-xfce_laptop: [suggested]
+  - patterns-xfce-xfce_office: [suggested]
+  - patterns-yast-yast2_yast2_basis: [suggested]
+  - patterns-yast-yast2_install_wf: [suggested]
+  - arabic-fonts
+  - arphic-uming-fonts
+  - cracklib-dict-full
+  - indic-fonts
+  - ipa-gothic-fonts
+  - khmeros-fonts
+  - lklug-fonts
+  # for now xen_server
+  - thai-fonts
+  - un-fonts
+  - yast2-trans-af
+  - yast2-trans-ar
+  - yast2-trans-bg
+  - yast2-trans-bn
+  - yast2-trans-bs
+  - yast2-trans-ca
+  - yast2-trans-cs
+  - yast2-trans-cy
+  - yast2-trans-da
+  - yast2-trans-de
+  - yast2-trans-el
+  - yast2-trans-en_GB
+  - yast2-trans-en_US
+  - yast2-trans-es
+  - yast2-trans-et
+  - yast2-trans-fa
+  - yast2-trans-fi
+  - yast2-trans-fr
+  - yast2-trans-gl
+  - yast2-trans-gu
+  - yast2-trans-hi
+  - yast2-trans-hr
+  - yast2-trans-hu
+  - yast2-trans-id
+  - yast2-trans-it
+  - yast2-trans-ja
+  - yast2-trans-jv
+  - yast2-trans-ka
+  - yast2-trans-km
+  - yast2-trans-ko
+  - yast2-trans-lo
+  - yast2-trans-lt
+  - yast2-trans-mk
+  - yast2-trans-mr
+  - yast2-trans-nb
+  - yast2-trans-nl
+  - yast2-trans-pa
+  - yast2-trans-pl
+  - yast2-trans-pt
+  - yast2-trans-pt_BR
+  - yast2-trans-ro
+  - yast2-trans-ru
+  - yast2-trans-si
+  - yast2-trans-sk
+  - yast2-trans-sr
+  - yast2-trans-sv
+  - yast2-trans-ta
+  - yast2-trans-th
+  - yast2-trans-tr
+  - yast2-trans-uk
+  - yast2-trans-vi
+  - yast2-trans-wa
+  - yast2-trans-xh
+  - yast2-trans-zh_CN
+  - yast2-trans-zh_TW
+  - yast2-trans-zu
+  - patterns-desktop-books: [suggested]
+  - patterns-server-kvm_server: [suggested]
+  - patterns-base-minimal_base: [suggested]
+  - patterns-base-minimal_base_conflicts: [suggested]
+  - patterns-yast-x11_yast: [suggested]
+  - patterns-server-xen_server: [suggested]
+  # bluncks 2nd baby
+  - apport-gtk
+  - apport-qt
+  # bnc#431280 (Japanese fonts)
+  - arphic-uming-fonts
+  - capi4hylafax
+  # FAX
+  - capisuite
+  - cellwriter
+  - clicfs
+  - createrepo
+  - eekboard
+  - git
+  # hylafax as requested by kkeil
+  - hylafax+
+  - hylafax+-client
+  - isns
+  # kdump+tools
+  - kdump
+  # all kernel flavors we want to have
+  - kernel-default
+  - kexec-tools
+  # kiwi as requested by ms
+  - kiwi
+  - kiwi-config-openSUSE
+  - kiwi-desc-isoboot
+  - kiwi-desc-netboot
+  - kiwi-desc-oemboot
+  - kiwi-desc-vmxboot
+
   - patterns-media-rest_dvd: [suggested]
   # all loggers
   - systemd-logger
diff --git a/i686_kernel_ftp.group b/i686_kernel_ftp.group
deleted file mode 100644
index 55014b1..0000000
--- a/i686_kernel_ftp.group
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<group name="i686_kernels_ftp">
- <conditional name="i686_special" />
- <packagelist relationship="requires">
-  <package name="kernel-debug-base"/>
-  <package name="kernel-debug-devel"/>
-  <package name="kernel-debug"/>
-<!--
-  <package name="kernel-ec2-base"/>
-  <package name="kernel-ec2-devel"/>
-  <package name="kernel-ec2"/>
--->
-  <package name="kernel-vanilla-devel"/>
-  <package name="kernel-vanilla"/>
-<!--
-  <package name="kernel-xen-base"/>
-  <package name="kernel-xen-devel"/>
-  <package name="kernel-xen"/>
--->
- </packagelist>
-</group>
-
diff --git a/i686_list.group b/i686_list.group
deleted file mode 100644
index 462787c..0000000
--- a/i686_list.group
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<group name="i586_additional">
- <conditional name="i586_special" />
- <packagelist relationship="requires">
-  <package name="glibc-devel" />
-  <package name="glibc" />
- </packagelist>
-</group>
-
-<group name="i686_packages">
-  <conditional name="i686_replacement" />
-  <packagelist relationship="requires">
-    <package name="MozillaFirefox" />
-    <package name="MozillaFirefox-devel" />
-    <package name="MozillaFirefox-buildsymbols" />
-    <package name="MozillaFirefox-translations-common" />
-    <package name="MozillaFirefox-translations-other" />
-  </packagelist>
-</group>
-
-
diff --git a/openSUSE.product.in b/openSUSE.product.in
index 25a381e..bbb9cd2 100644
--- a/openSUSE.product.in
+++ b/openSUSE.product.in
@@ -79,12 +79,7 @@
   </products>
 
   <xi:include href="defaults-conditionals.include"/>
-
-  <repositories>
-    <repository path="obs://openSUSE:Factory/standard"/>
-    <repository path="obs://openSUSE:Factory:Live/standard"/>
-  </repositories>
-
+  <xi:include href="defaults-repositories.include"/>
   <xi:include href="defaults-archsets.include"/>
 
   <mediasets>
@@ -140,7 +135,6 @@
       <use group="dvd.i586" create_pattern="false"/>
       <use group="dvd.x86_64" create_pattern="false"/>
       <use group="i586_additional" create_pattern="false"/>
-      <use group="i686_packages" create_pattern="false"/>
       <use group="kernel_pae_special" create_pattern="false"/>
 
       <archsets>
@@ -188,8 +182,46 @@
 
   <xi:include href="NON_FTP_PACKAGES.group"/>
   <xi:include href="dvd.group"/>
-  <xi:include href="i686_list.group" />
-  <xi:include href="i686_kernel_ftp.group" />
+
+  <group name="i586_additional">
+    <conditional name="i586_special"/>
+    <packagelist relationship="requires">
+      <package name="glibc-devel"/>
+      <package name="glibc"/>
+    </packagelist>
+  </group>
+
+  <group name="i686_packages">
+    <conditional name="i686_replacement"/>
+    <packagelist relationship="requires">
+      <package name="MozillaFirefox"/>
+      <package name="MozillaFirefox-devel"/>
+      <package name="MozillaFirefox-buildsymbols"/>
+      <package name="MozillaFirefox-translations-common"/>
+      <package name="MozillaFirefox-translations-other"/>
+    </packagelist>
+  </group>
+
+  <group name="i686_kernels_ftp">
+    <conditional name="i686_special"/>
+    <packagelist relationship="requires">
+      <package name="kernel-debug-base"/>
+      <package name="kernel-debug-devel"/>
+      <package name="kernel-debug"/>
+      <!--
+        <package name="kernel-ec2-base"/>
+        <package name="kernel-ec2-devel"/>
+        <package name="kernel-ec2"/>
+      -->
+      <package name="kernel-vanilla-devel"/>
+      <package name="kernel-vanilla"/>
+      <!--
+        <package name="kernel-xen-base"/>
+        <package name="kernel-xen-devel"/>
+        <package name="kernel-xen"/>
+      -->
+    </packagelist>
+  </group>
 
   <group name="kernel_pae_special">
     <conditional name="only_i686"/>