diff --git a/tools/make/viv_sim_preamble.mak b/tools/make/viv_sim_preamble.mak
index 514b06a..f7dfd45 100644
--- a/tools/make/viv_sim_preamble.mak
+++ b/tools/make/viv_sim_preamble.mak
@@ -12,13 +12,12 @@ SIM_RUNTIME_US = 1000000000
 
 # Define part using PART_ID (<device>/<package>/<speedgrade>)
 # and architecture (zynq, kintex7, or artix7)
-# 
-# Most simulations are part agnostic, but the user can override 
+#
+# Most simulations are part agnostic, but the user can override
 # these if needed in the makefile in the simulation directory
 #
-# TODO : Update to set from setupenv.sh
 ARCH ?= kintex7
-PART_ID ?= xc7k410t/ffg900/-2	
+PART_ID ?= xc7k410t/ffg900/-2
 
 # Include makefiles and sources for the DUT and its dependencies
 include $(BASE_DIR)/../lib/sim/Makefile.srcs
@@ -48,7 +47,7 @@ vars::
 	env
 	@echo "ARCH=$(ARCH)"
 	@echo "PART_ID=$(PART_ID)"
-   
+
 all:
 	$(error "all" or "<empty>" is not a valid target. Run make help for a list of supported targets.)
 
diff --git a/top/e31x/setupenv.sh b/top/e31x/setupenv.sh
index 940cced..b7023f2 100644
--- a/top/e31x/setupenv.sh
+++ b/top/e31x/setupenv.sh
@@ -8,4 +8,8 @@ declare -A PRODUCT_ID_MAP
 PRODUCT_ID_MAP["E310_SG1"]="zynq/xc7z020/clg484/-1"
 PRODUCT_ID_MAP["E310_SG3"]="zynq/xc7z020/clg484/-3"
 
+# Set default part for simulation
+export ARCH=zynq
+export PART_ID="xc7z020/clg484/-3"
+
 source $REPO_BASE_PATH/tools/scripts/setupenv_base.sh
diff --git a/top/e320/setupenv.sh b/top/e320/setupenv.sh
index 76bf520..13f0b3b 100644
--- a/top/e320/setupenv.sh
+++ b/top/e320/setupenv.sh
@@ -7,4 +7,8 @@ REPO_BASE_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
 declare -A PRODUCT_ID_MAP
 PRODUCT_ID_MAP["E320"]="zynq/xc7z045/ffg900/-3"
 
+# Set default part for simulation
+export ARCH=zynq
+export PART_ID="xc7z045/ffg900/-3"
+
 source $REPO_BASE_PATH/tools/scripts/setupenv_base.sh
diff --git a/top/n3xx/setupenv.sh b/top/n3xx/setupenv.sh
index 0be100b..bb20a33 100644
--- a/top/n3xx/setupenv.sh
+++ b/top/n3xx/setupenv.sh
@@ -10,4 +10,8 @@ PRODUCT_ID_MAP["N310"]="zynq/xc7z100/ffg900/-2"
 PRODUCT_ID_MAP["N320"]="zynq/xc7z100/ffg900/-2"
 PRODUCT_ID_MAP["EISCAT"]="zynq/xc7z100/ffg900/-2"
 
+# Set default part for simulation
+export ARCH=zynq
+export PART_ID="xc7z100/ffg900/-2"
+
 source $REPO_BASE_PATH/tools/scripts/setupenv_base.sh
diff --git a/top/x300/setupenv.sh b/top/x300/setupenv.sh
index 8296286..6065a5c 100644
--- a/top/x300/setupenv.sh
+++ b/top/x300/setupenv.sh
@@ -8,4 +8,8 @@ declare -A PRODUCT_ID_MAP
 PRODUCT_ID_MAP["X300"]="kintex7/xc7k325t/ffg900/-2"
 PRODUCT_ID_MAP["X310"]="kintex7/xc7k410t/ffg900/-2"
 
+# Set default part for simulation
+export ARCH=kintex7
+export PART_ID="xc7k410t/ffg900/-2"
+
 source $REPO_BASE_PATH/tools/scripts/setupenv_base.sh
diff --git a/top/x400/setupenv.sh b/top/x400/setupenv.sh
index 38bed74..80da944 100644
--- a/top/x400/setupenv.sh
+++ b/top/x400/setupenv.sh
@@ -13,4 +13,8 @@ REPO_BASE_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)
 declare -A PRODUCT_ID_MAP
 PRODUCT_ID_MAP["X410"]="zynquplusRFSOC/xczu28dr/ffvg1517/-1/e"
 
+# Set default part for simulation
+export ARCH=zynquplusRFSOC
+export PART_ID="xczu28dr/ffvg1517/-1/e"
+
 source $REPO_BASE_PATH/tools/scripts/setupenv_base.sh