diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index 9806fd5..40ed966 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -14,6 +14,8 @@
 
 Test Teardown     Code Update Test Teardown
 
+Force Tags        BMC_Code_Update
+
 *** Variables ***
 
 ${QUIET}                          ${1}
diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 03cfae8..44f61af 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -28,6 +28,8 @@
 
 Test Teardown     Code Update Test Teardown
 
+Force Tags        Host_Code_Update
+
 *** Variables ***
 
 ${QUIET}                          ${1}
diff --git a/test_lists/skip_test_extended b/test_lists/skip_test_extended
index 0228295..ab19d12 100644
--- a/test_lists/skip_test_extended
+++ b/test_lists/skip_test_extended
@@ -1,15 +1,33 @@
+# Remove old code update
+# TODO: https://github.com/openbmc/openbmc-test-automation/issues/1054
+-e Test_Basic_BMC_Performance_Before_Code_Update
+-e Check_Core_Dump_Exist_Before_Code_Update
+-e Check_URLs_Before_Code_Update
 -e Initiate_Code_Update_BMC
+-e Install_BMC_Debug_Tarball
+-e Compare_URLs_Before_And_After_Code_Update
+-e Test_Basic_BMC_Performance_At_Ready_State
+-e Check_Core_Dump_Exist_After_Code_Update
+-e Enable_Core_Dump_File_Size_To_Be_Unlimited
 -e BIOS_Code_Update
+# Needs Jenkins setup.
+# TODO: https://github.com/openbmc/openbmc-test-automation/issues/1005
+-e Upload_Test
+-e BMC_Code_Update
+-e Host_Code_Update
+-e Reset_Network_During_BMC_Code_Update
+-e Reset_Network_During_Host_Code_Update
+-e Host_Mult_Code_Update
+# Others NA tests.
 -e Run_Keyword_Pgm
+# Factory reset must not run in CT.
 -e Factory_Reset
 -e Full_Suite_Regression
 -e AC_Cycles
--e Host_Network
--e Networkd_Ext
--e NetworkManager
 -e Network_Nping
+# Mutliple runs only needed for stability.
 -e Run_Multiple_Power_Cycle
+-e Run_Multiple_Reboot
 -e General_boot_testing
--e Upload_Test
 -e SLP_Service_Test
 -e Check_Network_Latency