diff --git a/fedora-arm-python-classroom.ks b/fedora-arm-python-classroom.ks
new file mode 100644
index 0000000..866aea0
--- /dev/null
+++ b/fedora-arm-python-classroom.ks
@@ -0,0 +1,8 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# The ARM Workstion based Python Classroom Lab
+
+%include fedora-arm-workstation.ks
+%include fedora-python-classroom-gnome-common.ks
diff --git a/fedora-live-python-classroom.ks b/fedora-live-python-classroom.ks
index d8a0220..2f59b01 100644
--- a/fedora-live-python-classroom.ks
+++ b/fedora-live-python-classroom.ks
@@ -2,109 +2,8 @@
 # http://fedoraproject.org/wiki/SIGs/Python
 # mailto:python-devel@lists.fedoraproject.org
 
+# The Workstion based Python Classroom Lab
+
 %include fedora-live-workstation.ks
 %include fedora-live-minimization.ks
-
-
-%packages
-@python-classroom
-
-# Remove Pythons possibly recommended by tox
--python26
--python33
--python34
--python35
--pypy
-
-# Remove extra gnome-y things
--@graphical-internet
--@games
--@sound-and-video
--@multimedia
--dleyna*
--evolution*
--gnome-boxes
--gnome-calendar
--gnome-clocks
--gnome-contacts
--gnome-disk-utility
--gnome-documents
--gnome-font-viewer
--gnome-maps
--gnome-weather
--grilo-plugins
--cheese
--totem
--totem-nautilus
-
-# This is no longer workstation
--@workstation-product
--fedora-productimg-workstation
-
-# Add a web browser
-@firefox
-
-# Remove office suite
--@libreoffice
--libreoffice-*
--planner
-
-# Drop the Java plugin and Java
--icedtea-web
--java*
-
-# No printing
--@printing
--foomatic-db-ppds
--foomatic
-
-# Dictionaries are big
--aspell-*
--hunspell-*
--words
-
-# Help and art can be big, too
--gnome-user-docs
--desktop-backgrounds-basic
--*backgrounds-extras
-
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
-# Don't need this
--linux-atm
-
-# Drop some system-config things
--system-config-language
--system-config-network
--system-config-rootpassword
--system-config-services
--policycoreutils-gui
-
-%end
-
-
-
-
-%post
-
-#Override the favorite desktop application in Dash
-sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
-
-%end
+%include fedora-python-classroom-gnome-common.ks
diff --git a/fedora-python-classroom-common.ks b/fedora-python-classroom-common.ks
new file mode 100644
index 0000000..a9cb371
--- /dev/null
+++ b/fedora-python-classroom-common.ks
@@ -0,0 +1,17 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# Common packages of all Python Classroom images
+
+%packages
+@python-classroom
+
+# Remove Pythons possibly recommended by tox
+-python26
+-python33
+-python34
+-python35
+-pypy
+
+%end
diff --git a/fedora-python-classroom-gnome-common.ks b/fedora-python-classroom-gnome-common.ks
new file mode 100644
index 0000000..61c98be
--- /dev/null
+++ b/fedora-python-classroom-gnome-common.ks
@@ -0,0 +1,99 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
+# GNOME part of Python Classroom images
+
+%include fedora-python-classroom-common.ks
+
+%packages
+# Remove extra gnome-y things
+-@graphical-internet
+-@games
+-@sound-and-video
+-@multimedia
+-dleyna*
+-evolution*
+-gnome-boxes
+-gnome-calendar
+-gnome-clocks
+-gnome-contacts
+-gnome-disk-utility
+-gnome-documents
+-gnome-font-viewer
+-gnome-maps
+-gnome-weather
+-grilo-plugins
+-cheese
+-totem
+-totem-nautilus
+
+# This is no longer workstation
+-@workstation-product
+-fedora-productimg-workstation
+
+# Add a web browser
+@firefox
+
+# Remove office suite
+-@libreoffice
+-libreoffice-*
+-planner
+
+# Drop the Java plugin and Java
+-icedtea-web
+-java*
+
+# No printing
+-@printing
+-foomatic-db-ppds
+-foomatic
+
+# Dictionaries are big
+-aspell-*
+-hunspell-*
+-words
+
+# Help and art can be big, too
+-gnome-user-docs
+-desktop-backgrounds-basic
+-*backgrounds-extras
+
+# Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+
+# Don't need this
+-linux-atm
+
+# Drop some system-config things
+-system-config-language
+-system-config-network
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+
+%end
+
+
+%post
+
+#Override the favorite desktop application in Dash
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
+
+%end
diff --git a/fedora-python-classroom-vagrant.ks b/fedora-python-classroom-vagrant.ks
index 158003c..91c37a2 100644
--- a/fedora-python-classroom-vagrant.ks
+++ b/fedora-python-classroom-vagrant.ks
@@ -1,15 +1,8 @@
+# Maintained by the Fedora Python SIG:
+# http://fedoraproject.org/wiki/SIGs/Python
+# mailto:python-devel@lists.fedoraproject.org
+
 # Like the Python Classroom image, but tuned for vagrant.
 
 %include fedora-cloud-base-vagrant.ks
-
-%packages
-@python-classroom
-
-# Remove Pythons possibly recommended by tox
--python26
--python33
--python34
--python35
--pypy
-
-%end
+%include fedora-python-classroom-common.ks