diff --git a/designs/vivado/scalp_firmware/2020.2/src/hdl/scalp_firmware.vhd b/designs/vivado/scalp_firmware/2020.2/src/hdl/scalp_firmware.vhd
index eb1348ff850ae7598c60e113cc31fb55cd6337fe..fea8251cab004a136f6e3606176b1d36f568d35f 100644
--- a/designs/vivado/scalp_firmware/2020.2/src/hdl/scalp_firmware.vhd
+++ b/designs/vivado/scalp_firmware/2020.2/src/hdl/scalp_firmware.vhd
@@ -517,54 +517,56 @@ architecture arch of scalp_firmware is
     signal DebugBackPressureResetxR : t_rx_back_pressure_reset                           := C_NO_RX_BACK_PRESSURE_RESET;
 
     -- Attributes
-    attribute mark_debug                 : string;
-    attribute keep                       : string;
+    attribute mark_debug                      : string;
+    attribute keep                            : string;
     -- Clocks
-    attribute keep of PSSysClkxC         : signal is "true";
-    attribute keep of GTRefClk0xC        : signal is "true";
-    attribute keep of GTRefClk1xC        : signal is "true";
-    attribute keep of AuroraClkSlavexC   : signal is "true";
-    attribute keep of AuroraClkMasterxC  : signal is "true";
+    attribute keep of PSSysClkxC              : signal is "true";
+    attribute keep of GTRefClk0xC             : signal is "true";
+    attribute keep of GTRefClk1xC             : signal is "true";
+    attribute keep of AuroraClkSlavexC        : signal is "true";
+    attribute keep of AuroraClkMasterxC       : signal is "true";
     -- Scalp Router
-    -- attribute mark_debug of RXAxism2sVectorxD : signal is "true";
-    -- attribute keep of RXAxism2sVectorxD       : signal is "true";
-    -- attribute mark_debug of RXAxiss2mVectorxD : signal is "true";
-    -- attribute keep of RXAxiss2mVectorxD       : signal is "true";
-    -- attribute mark_debug of TXAxiss2mVectorxD : signal is "true";
-    -- attribute keep of TXAxiss2mVectorxD       : signal is "true";
+    attribute mark_debug of RXAxism2sVectorxD : signal is "true";
+    attribute keep of RXAxism2sVectorxD       : signal is "true";
+    attribute mark_debug of RXAxiss2mVectorxD : signal is "true";
+    attribute keep of RXAxiss2mVectorxD       : signal is "true";
+    attribute mark_debug of TXAxiss2mVectorxD : signal is "true";
+    attribute keep of TXAxiss2mVectorxD       : signal is "true";
+    attribute mark_debug of TXAxism2sVectorxD : signal is "true";
+    attribute keep of TXAxism2sVectorxD       : signal is "true";
     -- Scalp Aurora PHY Ready -> TX Side
-    attribute mark_debug of NorthTXM2SxD : signal is "true";
-    attribute keep of NorthTXM2SxD       : signal is "true";
-    attribute mark_debug of NorthTXS2MxD : signal is "true";
-    attribute keep of NorthTXS2MxD       : signal is "true";
-    attribute mark_debug of EastTXM2SxD  : signal is "true";
-    attribute keep of EastTXM2SxD        : signal is "true";
-    attribute mark_debug of EastTXS2MxD  : signal is "true";
-    attribute keep of EastTXS2MxD        : signal is "true";
-    attribute mark_debug of SouthTXM2SxD : signal is "true";
-    attribute keep of SouthTXM2SxD       : signal is "true";
-    attribute mark_debug of SouthTXS2MxD : signal is "true";
-    attribute keep of SouthTXS2MxD       : signal is "true";
-    attribute mark_debug of WestTXM2SxD  : signal is "true";
-    attribute keep of WestTXM2SxD        : signal is "true";
-    attribute mark_debug of WestTXS2MxD  : signal is "true";
-    attribute keep of WestTXS2MxD        : signal is "true";
-    attribute mark_debug of NorthRXM2SxD : signal is "true";
-    attribute keep of NorthRXM2SxD       : signal is "true";
-    attribute mark_debug of NorthRXS2MxD : signal is "true";
-    attribute keep of NorthRXS2MxD       : signal is "true";
-    attribute mark_debug of EastRXM2SxD  : signal is "true";
-    attribute keep of EastRXM2SxD        : signal is "true";
-    attribute mark_debug of EastRXS2MxD  : signal is "true";
-    attribute keep of EastRXS2MxD        : signal is "true";
-    attribute mark_debug of SouthRXM2SxD : signal is "true";
-    attribute keep of SouthRXM2SxD       : signal is "true";
-    attribute mark_debug of SouthRXS2MxD : signal is "true";
-    attribute keep of SouthRXS2MxD       : signal is "true";
-    attribute mark_debug of WestRXM2SxD  : signal is "true";
-    attribute keep of WestRXM2SxD        : signal is "true";
-    attribute mark_debug of WestRXS2MxD  : signal is "true";
-    attribute keep of WestRXS2MxD        : signal is "true";
+    attribute mark_debug of NorthTXM2SxD      : signal is "true";
+    attribute keep of NorthTXM2SxD            : signal is "true";
+    attribute mark_debug of NorthTXS2MxD      : signal is "true";
+    attribute keep of NorthTXS2MxD            : signal is "true";
+    attribute mark_debug of EastTXM2SxD       : signal is "true";
+    attribute keep of EastTXM2SxD             : signal is "true";
+    attribute mark_debug of EastTXS2MxD       : signal is "true";
+    attribute keep of EastTXS2MxD             : signal is "true";
+    attribute mark_debug of SouthTXM2SxD      : signal is "true";
+    attribute keep of SouthTXM2SxD            : signal is "true";
+    attribute mark_debug of SouthTXS2MxD      : signal is "true";
+    attribute keep of SouthTXS2MxD            : signal is "true";
+    attribute mark_debug of WestTXM2SxD       : signal is "true";
+    attribute keep of WestTXM2SxD             : signal is "true";
+    attribute mark_debug of WestTXS2MxD       : signal is "true";
+    attribute keep of WestTXS2MxD             : signal is "true";
+    attribute mark_debug of NorthRXM2SxD      : signal is "true";
+    attribute keep of NorthRXM2SxD            : signal is "true";
+    attribute mark_debug of NorthRXS2MxD      : signal is "true";
+    attribute keep of NorthRXS2MxD            : signal is "true";
+    attribute mark_debug of EastRXM2SxD       : signal is "true";
+    attribute keep of EastRXM2SxD             : signal is "true";
+    attribute mark_debug of EastRXS2MxD       : signal is "true";
+    attribute keep of EastRXS2MxD             : signal is "true";
+    attribute mark_debug of SouthRXM2SxD      : signal is "true";
+    attribute keep of SouthRXM2SxD            : signal is "true";
+    attribute mark_debug of SouthRXS2MxD      : signal is "true";
+    attribute keep of SouthRXS2MxD            : signal is "true";
+    attribute mark_debug of WestRXM2SxD       : signal is "true";
+    attribute keep of WestRXM2SxD             : signal is "true";
+    attribute mark_debug of WestRXS2MxD       : signal is "true";
+    attribute keep of WestRXS2MxD             : signal is "true";
 
 begin
 
diff --git a/ips/hw/scalp_router/src/hdl/scalp_rx_side.vhd b/ips/hw/scalp_router/src/hdl/scalp_rx_side.vhd
index d65087d6dd4e8a8afa1edd6b922e3e29eac789d9..9664a43a8764638c3420052446ccfb8eb3e13cf9 100644
--- a/ips/hw/scalp_router/src/hdl/scalp_rx_side.vhd
+++ b/ips/hw/scalp_router/src/hdl/scalp_rx_side.vhd
@@ -119,32 +119,32 @@ architecture behavioral of scalp_rx_side is
     attribute mark_debug                     : string;
     attribute keep                           : string;
     --
-    attribute mark_debug of TXAxi4S2MLinkxD  : signal is "true";
-    attribute keep of TXAxi4S2MLinkxD        : signal is "true";
-    attribute mark_debug of RXSideStatexDP   : signal is "true";
-    attribute keep of RXSideStatexDP         : signal is "true";
-    attribute mark_debug of RXSideStatexDN   : signal is "true";
-    attribute keep of RXSideStatexDN         : signal is "true";
-    attribute mark_debug of ReadyInxD        : signal is "true";
-    attribute keep of ReadyInxD              : signal is "true";
-    attribute mark_debug of ReadyOutxD       : signal is "true";
-    attribute keep of ReadyOutxD             : signal is "true";
-    attribute mark_debug of ArbitratexS      : signal is "true";
-    attribute keep of ArbitratexS            : signal is "true";
-    attribute mark_debug of RequestVectorxDP : signal is "true";
-    attribute keep of RequestVectorxDP       : signal is "true";
-    attribute mark_debug of ArbitratedxS     : signal is "true";
-    attribute keep of ArbitratedxS           : signal is "true";
-    attribute mark_debug of GrantIndexxD     : signal is "true";
-    attribute keep of GrantIndexxD           : signal is "true";
-    attribute mark_debug of RequestVectorxDN : signal is "true";
-    attribute keep of RequestVectorxDN       : signal is "true";
-    attribute mark_debug of SchedulerAckxD   : signal is "true";
-    attribute keep of SchedulerAckxD         : signal is "true";
-    attribute mark_debug of RXAxi4S2MLinkxD  : signal is "true";
-    attribute keep of RXAxi4S2MLinkxD        : signal is "true";
-    attribute mark_debug of RXAxi4M2SLinkxD  : signal is "true";
-    attribute keep of RXAxi4M2SLinkxD        : signal is "true";
+    -- attribute mark_debug of TXAxi4S2MLinkxD  : signal is "true";
+    -- attribute keep of TXAxi4S2MLinkxD        : signal is "true";
+    -- attribute mark_debug of RXSideStatexDP   : signal is "true";
+    -- attribute keep of RXSideStatexDP         : signal is "true";
+    -- attribute mark_debug of RXSideStatexDN   : signal is "true";
+    -- attribute keep of RXSideStatexDN         : signal is "true";
+    -- attribute mark_debug of ReadyInxD        : signal is "true";
+    -- attribute keep of ReadyInxD              : signal is "true";
+    -- attribute mark_debug of ReadyOutxD       : signal is "true";
+    -- attribute keep of ReadyOutxD             : signal is "true";
+    -- attribute mark_debug of ArbitratexS      : signal is "true";
+    -- attribute keep of ArbitratexS            : signal is "true";
+    -- attribute mark_debug of RequestVectorxDP : signal is "true";
+    -- attribute keep of RequestVectorxDP       : signal is "true";
+    -- attribute mark_debug of ArbitratedxS     : signal is "true";
+    -- attribute keep of ArbitratedxS           : signal is "true";
+    -- attribute mark_debug of GrantIndexxD     : signal is "true";
+    -- attribute keep of GrantIndexxD           : signal is "true";
+    -- attribute mark_debug of RequestVectorxDN : signal is "true";
+    -- attribute keep of RequestVectorxDN       : signal is "true";
+    -- attribute mark_debug of SchedulerAckxD   : signal is "true";
+    -- attribute keep of SchedulerAckxD         : signal is "true";
+    -- attribute mark_debug of RXAxi4S2MLinkxD  : signal is "true";
+    -- attribute keep of RXAxi4S2MLinkxD        : signal is "true";
+    -- attribute mark_debug of RXAxi4M2SLinkxD  : signal is "true";
+    -- attribute keep of RXAxi4M2SLinkxD        : signal is "true";
 
 begin  -- architecture behavioral