diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index d9f0de8ca..c6529318d 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,19 +3,19 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.0.7          \
+5.0.8          \
 4.20.17-nc     \
-4.19.34-nc     \
+4.19.35-nc     \
 4.18.18-nc     \
 4.17.18-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.111-nc    \
+4.14.112-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.168-nc     \
+4.9.169-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
diff --git a/qla2x00t-32gbit/Makefile_in-tree b/qla2x00t-32gbit/Makefile_in-tree
index d87f9164f..4890174ed 100644
--- a/qla2x00t-32gbit/Makefile_in-tree
+++ b/qla2x00t-32gbit/Makefile_in-tree
@@ -13,9 +13,10 @@ ccflags-y += $(BUILD_MODE_CFLAGS_$(BUILD_MODE))
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \
 		qla_nx.o qla_mr.o qla_nx2.o qla_target.o qla_tmpl.o qla_nvme.o
+qla2x00tgt-objs := qla_tgt.o scst_qla2xxx.o
 
 obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
-obj-$(CONFIG_TCM_QLA2XXX) += tcm_qla2xxx.o
+obj-$(CONFIG_SCST_QLA_TGT_ADDON) += qla2x00tgt.o
 
 ccflags-y += -I$(src)/../../../include/scst/
 ccflags-y += $(call cc-option,-Wno-stringop-truncation)