diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e21035f0fa9d..a61f721895d4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -104,7 +104,7 @@ stages:
   - job:
     pool: sonictest
     displayName: "kvmtest-t0"
-    timeoutInMinutes: 240
+    timeoutInMinutes: 300
 
     steps:
     - template: .azure-pipelines/run-test-template.yml
diff --git a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
index 3fbbceb6989f..2fe765febcf3 100644
--- a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2
@@ -28,8 +28,6 @@ RUN apt-get install -yf kmod
 COPY ["files/dsserve", "files/bcmcmd", "start.sh", "bcmsh", "/usr/bin/"]
 RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd
 
-COPY ["profile.ini", "portmap.ini", "/etc/sai/"]
-
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ## Clean up
diff --git a/platform/broadcom/docker-saiserver-brcm/portmap.ini b/platform/broadcom/docker-saiserver-brcm/portmap.ini
deleted file mode 100644
index 7161416e4d4c..000000000000
--- a/platform/broadcom/docker-saiserver-brcm/portmap.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# alias         lanes
-Ethernet0       29,30,31,32
-Ethernet4       25,26,27,28
-Ethernet8       37,38,39,40
-Ethernet12      33,34,35,36
-Ethernet16      41,42,43,44
-Ethernet20      45,46,47,48
-Ethernet24      5,6,7,8
-Ethernet28      1,2,3,4
-Ethernet32      9,10,11,12
-Ethernet36      13,14,15,16
-Ethernet40      21,22,23,24
-Ethernet44      17,18,19,20
-Ethernet48      49,50,51,52
-Ethernet52      53,54,55,56
-Ethernet56      61,62,63,64
-Ethernet60      57,58,59,60
-Ethernet64      65,66,67,68
-Ethernet68      69,70,71,72
-Ethernet72      77,78,79,80
-Ethernet76      73,74,75,76
-Ethernet80      105,106,107,108
-Ethernet84      109,110,111,112
-Ethernet88      117,118,119,120
-Ethernet92      113,114,115,116
-Ethernet96      121,122,123,124
-Ethernet100     125,126,127,128
-Ethernet104     85,86,87,88
-Ethernet108     81,82,83,84
-Ethernet112     89,90,91,92
-Ethernet116     93,94,95,96
-Ethernet120     97,98,99,100
-Ethernet124     101,102,103,104
diff --git a/platform/broadcom/docker-saiserver-brcm/profile.ini b/platform/broadcom/docker-saiserver-brcm/profile.ini
deleted file mode 100644
index b64d997fb451..000000000000
--- a/platform/broadcom/docker-saiserver-brcm/profile.ini
+++ /dev/null
@@ -1 +0,0 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/td2-s6000-32x40G.config.bcm
diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
index e90e41645042..ccb107b3d1f8 100644
--- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf
+++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf
@@ -20,7 +20,7 @@ stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
-command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
+command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini
 priority=3
 autostart=false
 autorestart=false
diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
index e49050ac2acf..ab1bd9f21256 100644
--- a/platform/marvell-armhf/sai.mk
+++ b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.7.1-1
+export MRVL_SAI_VERSION = 1.7.1-2
 export MRVL_SAI = mrvllibsai_$(PLATFORM_ARCH)_$(MRVL_SAI_VERSION).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai