diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index ebde706..0afb325 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -89,164 +89,201 @@ data:
          %_with_python2 1
          %__python2 /app/bin/python2
          %_without_tests 1 #Disable all tests by default
+    arches: [x86_64]
   components:
     rpms:
       adobe-mappings-cmap:
         rationale: ghostscript dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       adobe-mappings-pdf:
         rationale: ghostscript dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       atlas:
         rationale: suitesparse dependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       babl:
         rationale: gegl dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       dbus-glib:
         rationale: gimp dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       dcraw:
         # after lcms2
         rationale: gegl dependency
         ref: rhel-8.3.0
         buildorder: 20
+        arches: [x86_64]
       gegl:
         # After babl, dcraw, gtk2, libspiro, OpenEXR, SDL, suitesparse
         rationale: gimp dependency
-        ref: rhel-8.3.0
+        ref: rhel-8.8.0
         buildorder: 60
+        arches: [x86_64]
       ghostscript:
         # After poppler, lcms2, jbig2dec
         rationale: gimp dependency
         ref: rhel-8.4.0
         buildorder: 30
+        arches: [x86_64]
       gimp:
         rationale: Application package
-        ref: stream-flatpak-rhel-8.3.1
+        ref: stream-2.8-rhel-8.8.0
         buildorder: 100
+        arches: [x86_64]
       gnome-themes-standard:
         # After gtk2
         rationale: for adwaita-gtk2-theme
         ref: rhel-8.3.0
         buildorder: 20
+        arches: [x86_64]
       google-droid-fonts:
         rationale: ghostscript dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       gtk2:
         rationale: gimp dependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       ilmbase:
         rationale: OpenEXR dependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       jbig2dec:
         rationale: ghostscript dependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       libidn:
         rationale: ghostscript dependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       libijs:
         rationale: ghostscript dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       libspiro:
         rationale: gegl dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       lcms2:
         rationale: dependency of dcraw, gimp, libmng, libpoppler
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       libmng:
         # After lcms2
         rationale: gimp dependency
         ref: rhel-8.3.0
         buildorder: 20
+        arches: [x86_64]
       libopenraw:
         # boost is only a *buildtime* dependency
         rationale: gegl gependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       libpaper:
         rationale: ghostscript dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       libXmu:
         rationale: gimp dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       libwmf:
         # After gtk2
         rationale: gimp dependency
         ref: rhel-8.3.0
         buildorder: 20
+        arches: [x86_64]
       OpenEXR:
         # After ilmbase
         rationale: gegl dependency
         ref: rhel-8.4.0
         buildorder: 20
+        arches: [x86_64]
       openjpeg2:
         rationale: ghostscript, poppler dependency
         ref: rhel-8.5.0
         buildorder: 10
+        arches: [x86_64]
       poppler:
         # After lcms2, openjpeg2
         rationale: gimp dependency
         ref: rhel-8.5.0
         buildorder: 20
+        arches: [x86_64]
       poppler-data:
         rationale: poppler dependency
         ref: rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       pygobject2:
         rationale: gimp dependency
         ref: stream-2.28.7-rhel-8.3.0
         buildorder: 50
+        arches: [x86_64]
       python2-pycairo:
         rationale: Python2 binding required by pygtk2
         ref: stream-python2
         buildorder: 50
+        arches: [x86_64]
       python2-rpm-macros:
         rationale: Python 2 RPM macros - dependency of python2-devel
         ref: stream-python27-rhel-8.3.0
         buildorder: 10
+        arches: [x86_64]
       python-nose:
         # after python2-coverage
         rationale: Dependency required by pygtk2
-        ref: stream-1.3.7-rhel-8.5.0
+        ref: stream-1.3.7-rhel-8.8.0
         buildorder: 50
+        arches: [x86_64]
       pygtk2:
         rationale: gimp dependency
         ref: stream-2.24-rhel-8.4.0
         buildorder: 60
+        arches: [x86_64]
       python2:
         rationale: gimp dependency
-        ref: stream-2.7-rhel-8.5.0
+        ref: stream-2.7-rhel-8.8.0
         buildorder: 20
+        arches: [x86_64]
       python-coverage:
         # after python2-setuptools
         rationale: python-nose build dependency
         ref: stream-4.5.1-rhel-8.3.0
         buildorder: 40
+        arches: [x86_64]
       python2-pip:
         # after python2-setuptools
         rationale: runtime recommends of python2
         ref: stream-9.0.3-rhel-8.3.0
         buildorder: 40
+        arches: [x86_64]
       python2-setuptools:
         rationale: runtime recommends of python2
         ref: stream-39.0.1-rhel-8.4.0
         buildorder: 30
+        arches: [x86_64]
       SDL:
         # Does everything with dlopen(); since this is just a stray
         # dependency and not something used when running the gimp,
@@ -255,18 +292,22 @@ data:
         rationale: gegl dependency
         ref: rhel-8.4.0
         buildorder: 10
+        arches: [x86_64]
       suitesparse:
         # After tbb, atlas
         rationale: gegl dependency
         ref: rhel-8.3.0
         buildorder: 50
+        arches: [x86_64]
       tbb:
         # after python2, python2-setuptools
         rationale: suitesparse dependency
         ref: stream-flatpak-rhel-8.3.1
         buildorder: 40
+        arches: [x86_64]
       urw-base35-fonts:
         rationale: ghostscript dependency
         ref: stream-flatpak-rhel-8.3.1
         buildorder: 10
+        arches: [x86_64]
 ...