diff --git a/build-options/board-tests.yaml b/build-options/board-tests.yaml
index c461d95d8a9dca027f1f318280a681e5fbecc190..e25e42929ccddb14763289204edb2b051e55a06e 100644
--- a/build-options/board-tests.yaml
+++ b/build-options/board-tests.yaml
@@ -2,7 +2,7 @@
 HSS:
     type: git
     link: https://git.beagleboard.org/beaglev-fire/hart-software-services.git
-    branch: develop-beaglev-fire
+    branch: ddr-training-speed-up
     board: bvf
 gateware:
     type: sources
diff --git a/build-options/default.yaml b/build-options/default.yaml
index 5c4ac1eef4743f2fa68ac7b809c8ff92082c53fa..39bd55588affe785b13869ce7c6074a3eca2b8b9 100644
--- a/build-options/default.yaml
+++ b/build-options/default.yaml
@@ -2,7 +2,7 @@
 HSS:
     type: git
     link: https://git.beagleboard.org/beaglev-fire/hart-software-services.git
-    branch: develop-beaglev-fire
+    branch: ddr-training-speed-up
     board: bvf
 gateware:
     type: sources
diff --git a/build-options/minimal.yaml b/build-options/minimal.yaml
index f54ee77e2040082603beb6bb63fef15898f8b9fc..7111f079751d1b2d2d9921fc1e3435e06322c0a5 100644
--- a/build-options/minimal.yaml
+++ b/build-options/minimal.yaml
@@ -2,7 +2,7 @@
 HSS:
     type: git
     link: https://git.beagleboard.org/beaglev-fire/hart-software-services.git
-    branch: develop-beaglev-fire
+    branch: ddr-training-speed-up
     board: bvf
 gateware:
     type: sources
diff --git a/build-options/robotics.yaml b/build-options/robotics.yaml
index 4dd0636bdc9761c0d60c6413207b429d2f09dde5..1bf315bee6e777b973fc1b4f1da8a341b59edae7 100644
--- a/build-options/robotics.yaml
+++ b/build-options/robotics.yaml
@@ -2,7 +2,7 @@
 HSS:
     type: git
     link: https://git.beagleboard.org/beaglev-fire/hart-software-services.git
-    branch: develop-beaglev-fire
+    branch: ddr-training-speed-up
     board: bvf
 gateware:
     type: sources
diff --git a/sources/MSS_Configuration/MSS_Configuration.cfg b/sources/MSS_Configuration/MSS_Configuration.cfg
index 5440c34e35a1d005e891923bf25db5185696b5bb..f2d7c78152af09ba20d9733d46b19a726335691c 100644
--- a/sources/MSS_Configuration/MSS_Configuration.cfg
+++ b/sources/MSS_Configuration/MSS_Configuration.cfg
@@ -644,12 +644,12 @@ LPDDR4_BANK_ADDR_WIDTH                              3
 LPDDR4_CA_ODT                                       RZQ4
 LPDDR4_CLOCK_DDR                                    800.0
 LPDDR4_COL_ADDR_WIDTH                               10
-LPDDR4_CONTROLLER_ADD_CMD_DRIVE                     48
-LPDDR4_CONTROLLER_CLK_DRIVE                         48
-LPDDR4_CONTROLLER_DQS_DRIVE                         48
-LPDDR4_CONTROLLER_DQS_ODT                           80
-LPDDR4_CONTROLLER_DQ_DRIVE                          48
-LPDDR4_CONTROLLER_DQ_ODT                            80
+LPDDR4_CONTROLLER_ADD_CMD_DRIVE                     40
+LPDDR4_CONTROLLER_CLK_DRIVE                         40
+LPDDR4_CONTROLLER_DQS_DRIVE                         40
+LPDDR4_CONTROLLER_DQS_ODT                           120
+LPDDR4_CONTROLLER_DQ_DRIVE                          40
+LPDDR4_CONTROLLER_DQ_ODT                            120
 LPDDR4_DM_MODE                                      DM
 LPDDR4_DQDQS_TRAINING_OFFSET                        1
 LPDDR4_DQ_ODT                                       RZQ2
@@ -680,7 +680,7 @@ LPDDR4_TIMING_RRD                                   10
 LPDDR4_TIMING_RTP                                   7.5
 LPDDR4_TIMING_WR                                    18
 LPDDR4_TIMING_WTR                                   10
-LPDDR4_VREF_CA                                      50
+LPDDR4_VREF_CA                                      35
 LPDDR4_VREF_CALIB_ENABLE                            1
 LPDDR4_VREF_CALIB_RANGE                             1
 LPDDR4_VREF_CALIB_VALUE                             31.2