diff --git a/dash-pipeline/Makefile b/dash-pipeline/Makefile
index 40cf83f46..f6111c6cd 100644
--- a/dash-pipeline/Makefile
+++ b/dash-pipeline/Makefile
@@ -859,20 +859,18 @@ kill-saichallenger-client:
 run-saichallenger-tests: run-saichallenger-functional-tests run-saichallenger-scale-tests
 
 run-saichallenger-functional-tests: deploy-ixiac
-        # Disabled due to https://github.com/sonic-net/DASH/issues/581
-	# $(DOCKER_RUN_SAI_CHALLENGER_CLIENT) \
-	# -w /sai-challenger/dash_tests/functional \
-	# $(DOCKER_FLAGS) \
-	# $(DOCKER_SAI_CHALLENGER_CLIENT_IMG) \
-	# ./run-tests.sh --setup=$(SAI_CHALLENGER_SETUP_FILE) $(SAI_CHALLENGER_TEST)
+	$(DOCKER_RUN_SAI_CHALLENGER_CLIENT) \
+	-w /sai-challenger/dash_tests/functional \
+	$(DOCKER_FLAGS) \
+	$(DOCKER_SAI_CHALLENGER_CLIENT_IMG) \
+	./run-tests.sh --setup=$(SAI_CHALLENGER_SETUP_FILE) $(SAI_CHALLENGER_TEST)
 
 run-saichallenger-scale-tests: deploy-ixiac
-        # Disabled due to https://github.com/sonic-net/DASH/issues/581
-	# $(DOCKER_RUN_SAI_CHALLENGER_CLIENT) \
-	# -w /sai-challenger/dash_tests/scale \
-	# $(DOCKER_FLAGS) \
-	# $(DOCKER_SAI_CHALLENGER_CLIENT_IMG) \
-	# ./run-tests.sh --setup=$(SAI_CHALLENGER_SETUP_FILE) $(SAI_CHALLENGER_TEST)
+	$(DOCKER_RUN_SAI_CHALLENGER_CLIENT) \
+	-w /sai-challenger/dash_tests/scale \
+	$(DOCKER_FLAGS) \
+	$(DOCKER_SAI_CHALLENGER_CLIENT_IMG) \
+	./run-tests.sh --setup=$(SAI_CHALLENGER_SETUP_FILE) $(SAI_CHALLENGER_TEST)
 
 run-saichallenger-tutorials: deploy-ixiac
 	$(DOCKER_RUN_SAI_CHALLENGER_CLIENT) \
diff --git a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client
index b0c8f4588..508237d63 100644
--- a/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client
+++ b/dash-pipeline/dockerfiles/Dockerfile.saichallenger-client
@@ -11,15 +11,16 @@ ADD SAI/rpc/saithrift-0.9.tar.gz /
 
 # Install the python libraries
 RUN cd /saithrift-0.9 && \
-        python3 setup.py install && \
+        pip3 install . && \
     cd / && \
         rm -rf saithrift-0.9 &&\
     cd thrift-0.11.0 && \
-        python3 setup.py install && \
+        pip3 install . && \
     cd / &&\
         rm -rf thrift-0.11.0 && \
     cd /SAI/test/ptf && \
-        python3 setup.py install && \
+        pip3 install . && \
     ln -s ${DASH_PATH}/test/test-cases/scale/saic ${SAI_CHALLENGER_PATH}/dash_tests
 
+
 CMD ["/usr/bin/supervisord"]
diff --git a/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py b/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py
index 89a7278a6..5ab97258d 100755
--- a/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py
+++ b/test/test-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py
@@ -29,8 +29,8 @@
 from pprint import pprint
 import pytest
 import dpugen
-from saigen.confbase import *
-from saigen.confutils import *
+from dpugen.confbase import *
+from dpugen.confutils import *
 
 current_file_dir = Path(__file__).parent