diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index fc71c17c8..5b6d6baaa 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,24 +3,25 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-4.7.1	       \
+4.8.0          \
+4.7.6-nc       \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.18-nc      \
+4.4.23-nc      \
 4.3.6-nc       \
 4.2.8-nc       \
-4.1.30-nc      \
+4.1.33-nc      \
 4.0.9-nc       \
 3.19.8-nc      \
-3.18.39-nc     \
+3.18.42-nc     \
 3.17.8-nc      \
-3.16.36-nc     \
+3.16.37-nc     \
 3.15.10-nc     \
-3.14.76-nc     \
+3.14.79-nc     \
 3.13.11-nc     \
-3.12.62-nc     \
+3.12.64-nc     \
 3.11.10-nc     \
-3.10.102-nc    \
+3.10.103-nc    \
 3.9.11-nc      \
 3.8.13-nc      \
 3.7.10-nc      \
@@ -28,7 +29,7 @@ ABT_KERNELS="  \
 3.5.7-nc       \
 3.4.112-nc     \
 3.3.8-nc       \
-3.2.81-nc      \
+3.2.82-nc      \
 3.1.10-nc      \
 3.0.101-nc     \
 2.6.39.4-nc    \
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
index 5fca60f2e..dbfe3726d 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
@@ -622,6 +622,7 @@ sub groups {
 			}
 		}
 		close $gHandle;
+		@groups = sort(@groups);
 		return (\@groups, undef);
 	}
 
@@ -814,7 +815,7 @@ sub deviceGroups {
 	}
 
 	close $dHandle;
-
+	@groups = sort(@groups);
 	return (\@groups, undef);
 }