diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index 575ed43..c3e03e7 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -1,4 +1,5 @@
 from common_tmtc.pus_tc.service_20_parameters import add_param_cmds
+from common_tmtc.pus_tc.service_3_housekeeping import add_hk_cmds
 from tmtccmd.config import (
     TmTcDefWrapper,
 )
@@ -20,5 +21,6 @@ def common_fsfw_service_op_code_dict() -> TmTcDefWrapper:
 
     add_tc_sched_cmds(def_wrapper)
     add_param_cmds(def_wrapper)
+    add_hk_cmds(def_wrapper)
 
     return def_wrapper
diff --git a/pus_tc/service_20_parameters.py b/pus_tc/service_20_parameters.py
index bb3a277..c1c3381 100644
--- a/pus_tc/service_20_parameters.py
+++ b/pus_tc/service_20_parameters.py
@@ -19,7 +19,7 @@ def add_param_cmds(defs: TmTcDefWrapper):
     op_code_entry.add(keys=["0", "test"], info="Generic Test")
     defs.add_service(
         name=str(PusServices.S20_PARAMETER.value),
-        info="Service 20 Parameters",
+        info="PUS Service 20 Parameters",
         op_code_entry=op_code_entry
     )
 
diff --git a/pus_tc/service_3_housekeeping.py b/pus_tc/service_3_housekeeping.py
index 4de6af8..2959849 100644
--- a/pus_tc/service_3_housekeeping.py
+++ b/pus_tc/service_3_housekeeping.py
@@ -2,6 +2,8 @@ from datetime import timedelta
 
 from spacepackets.ecss.tc import PusTelecommand
 
+from deps.spacepackets.spacepackets.ecss import PusServices
+from tmtccmd.config import TmTcDefWrapper, OpCodeEntry
 from tmtccmd.tc import QueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
 from tmtccmd.tc.pus_20_params import (
@@ -25,6 +27,16 @@ TEST_NOTIFICATION_ACTION_ID = 3
 PARAM_ACTIVATE_CHANGING_DATASETS = 4
 
 
+def add_hk_cmds(defs: TmTcDefWrapper):
+    op_code_entry = OpCodeEntry()
+    op_code_entry.add(keys=["0", "test"], info="Generic Test")
+    defs.add_service(
+        name=str(PusServices.S3_HOUSEKEEPING.value),
+        info="PUS Service 3 Housekeeping",
+        op_code_entry=op_code_entry
+    )
+
+
 def pack_service_3_commands_into(q: QueueHelper, op_code: str):
     current_ssc = 3000
     device_idx = 0
@@ -100,7 +112,7 @@ def pack_housekeeping_basic_test(
         unique_id=PARAM_ACTIVATE_CHANGING_DATASETS,
         parameter=True,
     )
-    q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data, ssc=0))
+    q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data))
 
     # Enable periodic reporting
     q.add_log_cmd("Enabling periodic thermal sensor packet generation: ")
@@ -131,7 +143,7 @@ def pack_housekeeping_basic_test(
         unique_id=PARAM_ACTIVATE_CHANGING_DATASETS,
         parameter=False,
     )
-    q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data, ssc=0))
+    q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=app_data))
 
 
 def pack_notification_basic_test(