diff --git a/fedora.conf b/fedora.conf
index a4fe485..b805d3a 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -392,7 +392,7 @@ image_build = {
                     'kickstart': 'fedora-python-classroom-vagrant.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 40,
-                    'arches': ['x86_64','i386'],
+                    'arches': ['x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Python_Classroom',
@@ -409,7 +409,7 @@ image_build = {
                     'kickstart': 'fedora-scientific-vagrant.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 40,
-                    'arches': ['x86_64','i386'],
+                    'arches': ['x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
                     'subvariant': 'Scientific',
@@ -475,8 +475,7 @@ live_media = {
             {
                 'name': 'Fedora-Workstation-Live',
                 'kickstart': 'fedora-live-workstation.ks',
-                'arches': ['x86_64', 'i386'],
-                'failable': ['i386'],
+                'arches': ['x86_64', ],
                 'repo': 'Everything',
                 'subvariant': 'Workstation'
 
@@ -486,8 +485,7 @@ live_media = {
             {
                 'name': 'Fedora-KDE-Live',
                 'kickstart': 'fedora-live-kde.ks',
-                'arches': ['x86_64', 'i386'],
-                'failable': ['i386'],
+                'arches': ['x86_64'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
                 'subvariant': 'KDE'
@@ -496,7 +494,7 @@ live_media = {
             {
                 'name': 'Fedora-Xfce-Live',
                 'kickstart': 'fedora-live-xfce.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -505,7 +503,7 @@ live_media = {
             {
                 'name': 'Fedora-SoaS-Live',
                 'kickstart': 'fedora-live-soas.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -514,7 +512,7 @@ live_media = {
             {
                 'name': 'Fedora-Cinnamon-Live',
                 'kickstart': 'fedora-live-cinnamon.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -523,7 +521,7 @@ live_media = {
             {
                 'name': 'Fedora-LXDE-Live',
                 'kickstart': 'fedora-live-lxde.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -532,7 +530,7 @@ live_media = {
             {
                 'name': 'Fedora-MATE_Compiz-Live',
                 'kickstart': 'fedora-live-mate_compiz.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -541,7 +539,7 @@ live_media = {
             {
                 'name': 'Fedora-LXQt-Live',
                 'kickstart': 'fedora-live-lxqt.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -552,7 +550,7 @@ live_media = {
             {
                 'name': 'Fedora-Astronomy_KDE-Live',
                 'kickstart': 'fedora-live-astronomy_kde.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -561,7 +559,7 @@ live_media = {
             {
                 'name': 'Fedora-Design_suite-Live',
                 'kickstart': 'fedora-live-design_suite.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -570,7 +568,7 @@ live_media = {
             {
                 'name': 'Fedora-Scientific_KDE-Live',
                 'kickstart': 'fedora-live-scientific_kde.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -579,7 +577,7 @@ live_media = {
             {
                 'name': 'Fedora-Games-Live',
                 'kickstart': 'fedora-live-games.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -588,7 +586,7 @@ live_media = {
             {
                 'name': 'Fedora-Security-Live',
                 'kickstart': 'fedora-live-security.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -597,7 +595,7 @@ live_media = {
             {
                 'name': 'Fedora-Jam_KDE-Live',
                 'kickstart': 'fedora-live-jam_kde.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -606,7 +604,7 @@ live_media = {
             {
                 'name': 'Fedora-Robotics-Live',
                 'kickstart': 'fedora-live-robotics.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
@@ -615,7 +613,7 @@ live_media = {
             {
                 'name': 'Fedora-Python-Classroom-Live',
                 'kickstart': 'fedora-live-python-classroom.ks',
-                'arches': ['x86_64', 'i386'],
+                'arches': ['x86_64'],
                 'failable': ['*'],
                 'repo': 'Everything',
                 'install_tree_from': 'Everything',
diff --git a/nightly.sh b/nightly.sh
index f85fe07..e5bf123 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -108,7 +108,7 @@ else
     TREENAME="F-$RELEASE"
 fi
 # disable sending email for now until we are sure we wont generating mass emails 
-./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/"  --only-arches i386 ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
+./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/"  --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
 
 [ -z "$ARCH" ] && {
 ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 27c68f6..13ea0b3 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -31,7 +31,6 @@
     <variant id="Labs" name="Labs" type="variant" is_empty="true">
         <arches>
             <arch>armhfp</arch>
-            <arch>i386</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -39,7 +38,6 @@
         <arches>
             <arch>armhfp</arch>
             <arch>aarch64</arch>
-            <arch>i386</arch>
             <arch>ppc64le</arch>
             <arch>s390x</arch>
             <arch>x86_64</arch>
@@ -78,7 +76,6 @@
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
-            <arch>i386</arch>
             <arch>x86_64</arch>
         </arches>
     </variant>
@@ -86,7 +83,6 @@
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
-            <arch>i386</arch>
             <arch>x86_64</arch>
         </arches>
         <groups>
@@ -118,7 +114,6 @@
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>
-            <arch>i386</arch>
             <arch>x86_64</arch>
             <arch>ppc64le</arch>
         </arches>