diff --git a/.etckeeper b/.etckeeper
index 395c336..4b1fb08 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -487,8 +487,6 @@ maybe chmod 0755 'dhcp/dhclient.d/chrony.sh'
 maybe chmod 0755 'dkms'
 maybe chmod 0644 'dkms/framework.conf'
 maybe chmod 0755 'dkms/sign_helper.sh'
-maybe chmod 0644 'dkms/template-dkms-mkrpm.spec'
-maybe chmod 0644 'dkms/template-dkms-redhat-kmod.spec'
 maybe chmod 0755 'dnf'
 maybe chmod 0755 'dnf/aliases.d'
 maybe chmod 0644 'dnf/dnf.conf'
diff --git a/dkms/framework.conf b/dkms/framework.conf
index 896ee93..0a43d5d 100644
--- a/dkms/framework.conf
+++ b/dkms/framework.conf
@@ -1,32 +1,33 @@
-## This configuration file modifies the behavior of
-## DKMS (Dynamic Kernel Module Support) and is sourced
-## in by DKMS every time it is run.
+# This configuration file modifies the behavior of DKMS (Dynamic Kernel Module
+# Support) and is sourced in by DKMS every time it is run.
 
-## Source Tree Location (default: /usr/src)
+# Source Tree Location (default: /usr/src):
 # source_tree="/usr/src"
 
-## DKMS Tree Location (default: /var/lib/dkms)
+# DKMS Tree Location (default: /var/lib/dkms):
 # dkms_tree="/var/lib/dkms"
 
-## Install Tree Location (default: /lib/modules)
+# Install Tree Location (default: /lib/modules):
 # install_tree="/lib/modules"
 
-## tmp Location (default: /tmp)
+# Temporary folder Location (default: /tmp):
 # tmp_location="/tmp"
 
-## verbosity setting (verbose will be active if you set it to a non-null value)
+# Verbosity setting, will be active if set to a non-null value:
 # verbose=""
 
-## symlink kernel modules (will be active if you set it to a non-null value)
-## This creates symlinks from the install_tree into the dkms_tree instead of
-## copying the modules. This preserves some space on the costs of being less
-## safe.
+# This creates symlinks from the install_tree into the dkms_tree instead of
+# copying the modules. This preserves some space on the costs of being less
+# safe. Symlinking will be active if set to a non-null value:
 # symlink_modules=""
 
-## Automatic installation and upgrade for all installed kernels (if set to a
-## non-null value)
+# Automatic installation and upgrade for all installed kernels if set to a
+# non-null value:
 # autoinstall_all_kernels=""
 
-## Script to sign modules during build, script is called with kernel version
-## and module name
+# Script to sign modules during build, script is called with kernel version
+# and module name:
 # sign_tool="/etc/dkms/sign_helper.sh"
+
+# Automatically modprobe the built modules upon succesful installation:
+modprobe_on_install="true"
diff --git a/dkms/template-dkms-mkrpm.spec b/dkms/template-dkms-mkrpm.spec
deleted file mode 100644
index a5f1f8b..0000000
--- a/dkms/template-dkms-mkrpm.spec
+++ /dev/null
@@ -1,82 +0,0 @@
-%{?!module_name: %{error: You did not specify a module name (%%module_name)}}
-%{?!version: %{error: You did not specify a module version (%%version)}}
-%{?!kernel_versions: %{error: You did not specify kernel versions (%%kernel_version)}}
-%{?!packager: %define packager DKMS <dkms-devel@lists.us.dell.com>}
-%{?!license: %define license Unknown}
-%{?!_dkmsdir: %define _dkmsdir /var/lib/dkms}
-%{?!_srcdir: %define _srcdir %_prefix/src}
-%{?!_datarootdir: %define _datarootdir %{_datadir}}
-
-Summary:	%{module_name} %{version} dkms package
-Name:		%{module_name}
-Version:	%{version}
-License:	%license
-Release:	1dkms
-BuildArch:	noarch
-Group:		System/Kernel
-Requires: 	dkms >= 1.95
-BuildRequires: 	dkms
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root/
-
-%description
-Kernel modules for %{module_name} %{version} in a DKMS wrapper.
-
-%prep
-if [ "%mktarball_line" != "none" ]; then
-        /usr/sbin/dkms mktarball -m %module_name -v %version %mktarball_line --archive `basename %{module_name}-%{version}.dkms.tar.gz`
-        cp -af %{_dkmsdir}/%{module_name}/%{version}/tarball/`basename %{module_name}-%{version}.dkms.tar.gz` %{module_name}-%{version}.dkms.tar.gz
-fi
-
-%install
-if [ "$RPM_BUILD_ROOT" != "/" ]; then
-        rm -rf $RPM_BUILD_ROOT
-fi
-mkdir -p $RPM_BUILD_ROOT/%{_srcdir}
-mkdir -p $RPM_BUILD_ROOT/%{_datarootdir}/%{module_name}
-
-if [ -d %{_sourcedir}/%{module_name}-%{version} ]; then
-        cp -Lpr %{_sourcedir}/%{module_name}-%{version} $RPM_BUILD_ROOT/%{_srcdir}
-fi
-
-if [ -f %{module_name}-%{version}.dkms.tar.gz ]; then
-        install -m 644 %{module_name}-%{version}.dkms.tar.gz $RPM_BUILD_ROOT/%{_datarootdir}/%{module_name}
-fi
-
-if [ -f %{_sourcedir}/common.postinst ]; then
-        install -m 755 %{_sourcedir}/common.postinst $RPM_BUILD_ROOT/%{_datarootdir}/%{module_name}/postinst
-fi
-
-%clean
-if [ "$RPM_BUILD_ROOT" != "/" ]; then
-        rm -rf $RPM_BUILD_ROOT
-fi
-
-%post
-for POSTINST in %{_prefix}/lib/dkms/common.postinst %{_datarootdir}/%{module_name}/postinst; do
-        if [ -f $POSTINST ]; then
-                $POSTINST %{module_name} %{version} %{_datarootdir}/%{module_name}
-                exit $?
-        fi
-        echo "WARNING: $POSTINST does not exist."
-done
-echo -e "ERROR: DKMS version is too old and %{module_name} was not"
-echo -e "built with legacy DKMS support."
-echo -e "You must either rebuild %{module_name} with legacy postinst"
-echo -e "support or upgrade DKMS to a more current version."
-exit 1
-
-%preun
-echo -e
-echo -e "Uninstall of %{module_name} module (version %{version}) beginning:"
-dkms remove -m %{module_name} -v %{version} --all --rpm_safe_upgrade
-exit 0
-
-%files
-%defattr(-,root,root)
-%{_srcdir}
-%{_datarootdir}/%{module_name}/
-
-%changelog
-* %(date "+%a %b %d %Y") %packager %{version}-%{release}
-- Automatic build by DKMS
-
diff --git a/dkms/template-dkms-redhat-kmod.spec b/dkms/template-dkms-redhat-kmod.spec
deleted file mode 100644
index 4ea87fa..0000000
--- a/dkms/template-dkms-redhat-kmod.spec
+++ /dev/null
@@ -1,37 +0,0 @@
-%{?!module_name: %{error: You did not specify a module name (%%module_name)}}
-%{?!version: %{error: You did not specify a module version (%%version)}}
-Name:		%{module_name}
-Version:	%{version}
-Release:	1%{?dist}
-Summary:	%{module_name}-%{version} RHEL Driver Update Program package
-
-License:	Unknown
-Source0:	%{module_name}-%{version}.tar.bz2
-BuildRequires:	%kernel_module_package_buildreqs
-
-%kernel_module_package default
-
-%description
-%{module_name}-%{version} RHEL Driver Update package.
-
-%prep
-%setup
-set -- *
-mkdir source
-mv "$@" source/
-mkdir obj
-
-%build
-for flavor in %flavors_to_build; do
-	rm -rf obj/$flavor
-	cp -r source obj/$flavor
-	make -C %{kernel_source $flavor} M=$PWD/obj/$flavor
-done
-
-%install
-export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
-export INSTALL_MOD_DIR=extra/%{name}
-for flavor in %flavors_to_build ; do
-	make -C %{kernel_source $flavor} modules_install \
-		M=$PWD/obj/$flavor
-done
diff --git a/kernel/install.d/dkms b/kernel/install.d/dkms
index c1d6df1..f1b3b38 100755
--- a/kernel/install.d/dkms
+++ b/kernel/install.d/dkms
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 
 if [[ "$1" == "add" ]]; then
 	/etc/kernel/postinst.d/dkms $2
diff --git a/kernel/prerm.d/dkms b/kernel/prerm.d/dkms
index c8116a3..55c5991 100755
--- a/kernel/prerm.d/dkms
+++ b/kernel/prerm.d/dkms
@@ -3,26 +3,16 @@
 # We're passed the version of the kernel being removed
 inst_kern=$1
 
-# This is applied from make_initrd function in dkms command, which
-# creates the possible initrd backup file.
-remove_initrd_backup() {
-	for initrd in "initrd-$1.img" "initramfs-$1.img" "initrd.img-$1" "initrd-$1"; do
-		rm -fv /boot/"${initrd}".old-dkms >&2
-	done
-}
-
 if [ -x /usr/sbin/dkms ]; then
 while read line; do
-   name=`echo "$line" | awk '{print $1}' | sed 's/,$//'`
-   vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'`
-   arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'`
+   name=`echo "$line" | awk '{print $1}' | sed 's/,$//' | cut -d'/' -f1`
+   vers=`echo "$line" | awk '{print $1}' | sed 's/,$//' | cut -d'/' -f2`
+   arch=`echo "$line" | awk '{print $3}' | sed 's/:$//'`
    echo "dkms: removing: $name $vers ($inst_kern) ($arch)" >&2
    dkms remove -m $name -v $vers -k $inst_kern -a $arch
 done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
 fi
 
-remove_initrd_backup "$inst_kern"
-
 rmdir --ignore-fail-on-non-empty \
 	"/lib/modules/$inst_kern/updates/dkms" \
 	"/lib/modules/$inst_kern/updates" 2>/dev/null
diff --git a/selinux/targeted/.policy.sha512 b/selinux/targeted/.policy.sha512
index ad725d3..4863673 100644
--- a/selinux/targeted/.policy.sha512
+++ b/selinux/targeted/.policy.sha512
@@ -1 +1 @@
-828a1b4dc0ed2742113500ad93be884d2fe2ac1b53b291ff72e6b8a8ef7ea5ab995278fbc172ea4cfd06d41a3a6fa0cf252337677eae720800df14b6be26129b
+476ad8f7bebe0c4407fdddd1956f763c644f8984d414c544897562cbbb1bd71f467b33c9380bb2df7ba161e44af45ded47bb811f7f30363f9f8a113ade3c2ade
diff --git a/selinux/targeted/contexts/files/file_contexts b/selinux/targeted/contexts/files/file_contexts
index f05c981..3dba223 100644
--- a/selinux/targeted/contexts/files/file_contexts
+++ b/selinux/targeted/contexts/files/file_contexts
@@ -847,7 +847,6 @@
 /etc/cfingerd(/.*)?	system_u:object_r:fingerd_etc_t:s0
 /etc/cherokee(/.*)?	system_u:object_r:httpd_config_t:s0
 /etc/cups/ppd(/.*)?	system_u:object_r:cupsd_rw_etc_t:s0
-/etc/glusterd(/.*)?	system_u:object_r:glusterd_conf_t:s0
 /etc/lighttpd(/.*)?	system_u:object_r:httpd_config_t:s0
 /etc/lvm/lock(/.*)?	system_u:object_r:lvm_lock_t:s0
 /etc/lvmtab\.d(/.*)?	system_u:object_r:lvm_metadata_t:s0
@@ -1086,7 +1085,6 @@
 /etc/bluetooth(/.*)?	system_u:object_r:bluetooth_conf_t:s0
 /etc/dnsmasq\.d(/.*)?	system_u:object_r:dnsmasq_etc_t:s0
 /etc/firewalld(/.*)?	system_u:object_r:firewalld_etc_rw_t:s0
-/etc/glusterfs(/.*)?	system_u:object_r:glusterd_conf_t:s0
 /etc/ipa/nssdb(/.*)?	system_u:object_r:cert_t:s0
 /etc/lvm/cache(/.*)?	system_u:object_r:lvm_metadata_t:s0
 /etc/mock/koji(/.*)?	system_u:object_r:httpd_sys_rw_content_t:s0
@@ -1467,7 +1465,6 @@
 /opt/VirtualBox(/.*)?/VBox.*\.so	--	system_u:object_r:textrel_shlib_t:s0
 /opt/teamviewer(/.*)?/bin/wine.*	--	system_u:object_r:wine_exec_t:s0
 /var/ftp/lib/ld[^/]*\.so(\.[^/]*)*	--	system_u:object_r:ld_so_t:s0
-/opt/glusterfs/[^/]+/sbin/glusterfsd	--	system_u:object_r:glusterd_exec_t:s0
 /usr/bin/gnome-[^/]*-thumbnailer(.sh)?	--	system_u:object_r:thumb_exec_t:s0
 /usr/share/gems(/.*)?/helper-scripts(/.*)?	system_u:object_r:bin_t:s0
 /usr/lib/python.*/site-packages/pymedia/muxer\.so	--	system_u:object_r:textrel_shlib_t:s0
@@ -1647,7 +1644,6 @@
 /var/run/console(/.*)?	system_u:object_r:pam_var_console_t:s0
 /var/run/couchdb(/.*)?	system_u:object_r:couchdb_var_run_t:s0
 /var/run/courier(/.*)?	system_u:object_r:courier_var_run_t:s0
-/var/run/gluster(/.*)?	system_u:object_r:glusterd_var_run_t:s0
 /var/run/hostapd(/.*)?	system_u:object_r:hostapd_var_run_t:s0
 /var/run/icecast(/.*)?	system_u:object_r:icecast_var_run_t:s0
 /var/run/krb5kdc(/.*)?	system_u:object_r:krb5kdc_var_run_t:s0
@@ -1752,9 +1748,7 @@
 /var/log/xend\.log.*	--	system_u:object_r:xend_var_log_t:s0
 /var/run/dhclient.*	--	system_u:object_r:dhcpc_var_run_t:s0
 /var/run/ebtables.*	--	system_u:object_r:iptables_var_run_t:s0
-/var/run/glusterd.*	--	system_u:object_r:glusterd_var_run_t:s0
 /var/run/stratisd.*	--	system_u:object_r:stratisd_var_run_t:s0
-/var/run/glusterd.*	-s	system_u:object_r:glusterd_var_run_t:s0
 /boot/lost\+found/.*	<<none>>
 /etc/\.resolv\.conf.*	system_u:object_r:net_conf_t:s0
 /etc/dovecot\.conf.*	system_u:object_r:dovecot_etc_t:s0
@@ -1821,7 +1815,6 @@
 /var/lib/ebtables(/.*)?	system_u:object_r:iptables_var_lib_t:s0
 /var/lib/fail2ban(/.*)?	system_u:object_r:fail2ban_var_lib_t:s0
 /var/lib/freeipmi(/.*)?	system_u:object_r:freeipmi_var_lib_t:s0
-/var/lib/glusterd(/.*)?	system_u:object_r:glusterd_var_lib_t:s0
 /var/lib/gssproxy(/.*)?	system_u:object_r:gssproxy_var_lib_t:s0
 /var/lib/kdcproxy(/.*)?	system_u:object_r:krb5kdc_var_lib_t:s0
 /var/lib/keystone(/.*)?	system_u:object_r:keystone_var_lib_t:s0
@@ -1871,7 +1864,6 @@
 /var/run/cyphesis(/.*)?	system_u:object_r:cyphesis_var_run_t:s0
 /var/run/faillock(/.*)?	system_u:object_r:faillog_t:s0
 /var/run/fcgiwrap(/.*)?	system_u:object_r:httpd_var_run_t:s0
-/var/run/glusterd(/.*)?	system_u:object_r:glusterd_var_run_t:s0
 /var/run/keystone(/.*)?	system_u:object_r:keystone_var_run_t:s0
 /var/run/lighttpd(/.*)?	system_u:object_r:httpd_var_run_t:s0
 /var/run/minidlna(/.*)?	system_u:object_r:minidlna_var_run_t:s0
@@ -2036,7 +2028,6 @@
 /var/lock/mrtg-rrd(/.*)?	system_u:object_r:mrtg_lock_t:s0
 /var/log/calamaris(/.*)?	system_u:object_r:calamaris_log_t:s0
 /var/log/denyhosts(/.*)?	system_u:object_r:denyhosts_var_log_t:s0
-/var/log/glusterfs(/.*)?	system_u:object_r:glusterd_log_t:s0
 /var/log/openshift(/.*)?	system_u:object_r:openshift_log_t:s0
 /var/log/pacemaker(/.*)?	system_u:object_r:cluster_var_log_t:s0
 /var/log/rhdb/rhdb(/.*)?	system_u:object_r:postgresql_log_t:s0
@@ -2666,7 +2657,6 @@
 /var/lib/docker-latest/.*/config\.env	system_u:object_r:container_ro_file_t:s0
 /opt/VBoxGuestAdditions.*/lib/VBox.*\.so	--	system_u:object_r:textrel_shlib_t:s0
 /sysroot/ostree/deploy/.*-atomic/deploy(/.*)?	system_u:object_r:root_t:s0
-/etc/rc\.d/init\.d/gluster.*	--	system_u:object_r:glusterd_initrc_exec_t:s0
 /etc/rc\.d/init\.d/neutron.*	--	system_u:object_r:neutron_initrc_exec_t:s0
 /etc/rc\.d/init\.d/quantum.*	--	system_u:object_r:neutron_initrc_exec_t:s0
 /usr/lib/cups/backend/hp.*	--	system_u:object_r:cupsd_exec_t:s0
@@ -3226,7 +3216,6 @@ dev/shm/var\.lib\.opencryptoki.*	system_u:object_r:pkcs_slotd_tmpfs_t:s0
 /usr/share/munin/plugins/postfix_mail.*	--	system_u:object_r:mail_munin_plugin_exec_t:s0
 /var/lib/likewise-open/krb5ccr_lsass\..*	--	system_u:object_r:lsassd_var_lib_t:s0
 /etc/sysconfig/network-scripts/ifdown.*	system_u:object_r:bin_t:s0
-/usr/libexec/glusterfs/peer_eventsapi.py	--	system_u:object_r:glusterd_exec_t:s0
 /var/run/dovecot/login/ssl-parameters.dat	--	system_u:object_r:dovecot_var_lib_t:s0
 /usr/lib/icinga/plugins/eventhandlers(/.*)	system_u:object_r:nagios_eventhandler_plugin_exec_t:s0
 /usr/lib/nagios/plugins/eventhandlers(/.*)	system_u:object_r:nagios_eventhandler_plugin_exec_t:s0
@@ -3282,7 +3271,6 @@ dev/shm/var\.lib\.opencryptoki.*	system_u:object_r:pkcs_slotd_tmpfs_t:s0
 /usr/lib/systemd/system/openstack-cinder-api.*	--	system_u:object_r:cinder_api_unit_file_t:s0
 /usr/lib/systemd/system/openstack-glance-api.*	--	system_u:object_r:glance_api_unit_file_t:s0
 /usr/lib/systemd/system/pkcs11proxyd-softhsm.*	--	system_u:object_r:pkcs11proxyd_unit_file_t:s0
-/usr/libexec/glusterfs/events/glustereventsd.py	--	system_u:object_r:glusterd_exec_t:s0
 /opt/OpenPrinting-Gutenprint/cups/lib/filter(/.*)?	system_u:object_r:bin_t:s0
 /usr/lib/systemd/system-generators/cloud-init.*	system_u:object_r:cloud_init_exec_t:s0
 /usr/share/mirrormanager/server/mirrormanager(/.*)?	system_u:object_r:mirrormanager_exec_t:s0
@@ -4463,7 +4451,6 @@ dev/shm/var\.lib\.opencryptoki.*	system_u:object_r:pkcs_slotd_tmpfs_t:s0
 /usr/sbin/dmeventd	--	system_u:object_r:lvm_exec_t:s0
 /usr/sbin/dumpe2fs	--	system_u:object_r:fsadm_exec_t:s0
 /usr/sbin/ebtables	--	system_u:object_r:iptables_exec_t:s0
-/usr/sbin/glusterd	--	system_u:object_r:glusterd_initrc_exec_t:s0
 /usr/sbin/groupadd	--	system_u:object_r:groupadd_exec_t:s0
 /usr/sbin/groupdel	--	system_u:object_r:groupadd_exec_t:s0
 /usr/sbin/groupmod	--	system_u:object_r:groupadd_exec_t:s0
@@ -4799,7 +4786,6 @@ dev/shm/var\.lib\.opencryptoki.*	system_u:object_r:pkcs_slotd_tmpfs_t:s0
 /usr/sbin/fence_tool	--	system_u:object_r:fenced_exec_t:s0
 /usr/sbin/freeradius	--	system_u:object_r:radiusd_exec_t:s0
 /usr/sbin/fstab-sync	--	system_u:object_r:updfstab_exec_t:s0
-/usr/sbin/glusterfsd	--	system_u:object_r:glusterd_exec_t:s0
 /usr/sbin/hypervkvpd	--	system_u:object_r:hypervkvp_exec_t:s0
 /usr/sbin/hypervvssd	--	system_u:object_r:hypervvssd_exec_t:s0
 /usr/sbin/ifdhandler	--	system_u:object_r:openct_exec_t:s0
@@ -5416,7 +5402,6 @@ dev/shm/var\.lib\.opencryptoki.*	system_u:object_r:pkcs_slotd_tmpfs_t:s0
 /usr/sbin/condor_vm-gahp	--	system_u:object_r:virtd_exec_t:s0
 /usr/sbin/dmsetup\.static	--	system_u:object_r:lvm_exec_t:s0
 /usr/sbin/fence_sanlockd	--	system_u:object_r:fenced_exec_t:s0
-/usr/sbin/glustereventsd	--	system_u:object_r:glusterd_exec_t:s0
 /usr/sbin/ldap-agent-bin	--	system_u:object_r:dirsrv_snmp_exec_t:s0
 /usr/sbin/modules-update	--	system_u:object_r:kmod_exec_t:s0
 /usr/sbin/mount\.ecryptfs	--	system_u:object_r:mount_ecryptfs_exec_t:s0
@@ -5746,7 +5731,6 @@ dev/shm/var\.lib\.opencryptoki.*	system_u:object_r:pkcs_slotd_tmpfs_t:s0
 /usr/sbin/abrt-upload-watch	--	system_u:object_r:abrt_upload_watch_exec_t:s0
 /usr/sbin/condor_negotiator	--	system_u:object_r:condor_negotiator_exec_t:s0
 /usr/sbin/courierldapaliasd	--	system_u:object_r:courier_exec_t:s0
-/usr/sbin/gluster-eventsapi	--	system_u:object_r:glusterd_exec_t:s0
 /usr/sbin/hwloc-dump-hwdata	--	system_u:object_r:hwloc_dhwd_exec_t:s0
 /usr/sbin/nsd-control-setup	--	system_u:object_r:nsd_exec_t:s0
 /usr/sbin/pacemaker-remoted	--	system_u:object_r:cluster_exec_t:s0
diff --git a/selinux/targeted/contexts/files/file_contexts.bin b/selinux/targeted/contexts/files/file_contexts.bin
index 463ce83..20cf35b 100644
Binary files a/selinux/targeted/contexts/files/file_contexts.bin and b/selinux/targeted/contexts/files/file_contexts.bin differ
diff --git a/selinux/targeted/policy/policy.31 b/selinux/targeted/policy/policy.31
index c981620..15e177b 100644
Binary files a/selinux/targeted/policy/policy.31 and b/selinux/targeted/policy/policy.31 differ
diff --git a/udev/hwdb.bin b/udev/hwdb.bin
index b4c2140..b1c6efd 100644
Binary files a/udev/hwdb.bin and b/udev/hwdb.bin differ