diff --git a/run-docker.sh b/run-docker.sh
index aadc4c78717d85bde3bdf3dcedd48824f5ba483b..5b4f718ce3f1b8d3db0fb9c517ce3a414817ebf6 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -22,6 +22,10 @@ DOCKER_INST_NAME="finn_${DOCKER_UNAME}"
 : ${JUPYTER_PORT=8888}
 : ${NETRON_PORT=8081}
 : ${PYNQ_BOARD="Pynq-Z1"}
+: ${PYNQ_IP="192.168.3.1"}
+: ${PYNQ_USERNAME="xilinx"}
+: ${PYNQ_PASSWORD="xilinx"}
+: ${PYNQ_TARGET_DIR="/home/xilinx/$DOCKER_INST_NAME"}
 
 # Absolute path to this script, e.g. /home/user/bin/foo.sh
 SCRIPT=$(readlink -f "$0")
@@ -112,6 +116,10 @@ docker run -t --rm --name $DOCKER_INST_NAME -it \
 -e FINN_ROOT="/workspace/finn" \
 -e VIVADO_IP_CACHE="$VIVADO_IP_CACHE" \
 -e PYNQ_BOARD=$PYNQ_BOARD \
+-e PYNQ_IP=$PYNQ_IP \
+-e PYNQ_USERNAME=$PYNQ_USERNAME \
+-e PYNQ_PASSWORD=$PYNQ_PASSWORD \
+-e PYNQ_TARGET_DIR=$PYNQ_TARGET_DIR \
 -p $JUPYTER_PORT:$JUPYTER_PORT \
 -p $NETRON_PORT:$NETRON_PORT \
 $DOCKER_TAG bash -c "$DOCKER_CMD"
diff --git a/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py b/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
index b00ac971f3e8bd403aadadfd956b96b3659746af..532b99d7fabeae82436d15e61c9e7cc965f0b0b3 100644
--- a/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
+++ b/tests/fpgadataflow/test_fpgadataflow_ip_stitch.py
@@ -275,10 +275,10 @@ def test_fpgadataflow_ipstitch_pynq_deployment_folder():
     model = ModelWrapper(
         ip_stitch_model_dir + "/test_fpgadataflow_ipstitch_pynq_driver.onnx"
     )
-    ip = "172.21.165.113"
-    username = "xilinx"
-    password = "xilinx"
-    target_dir = "/home/xilinx/" + os.environ["FINN_INST_NAME"]
+    ip = os.getenv("PYNQ_IP", "192.168.3.1")
+    username = os.getenv("PYNQ_USERNAME", "xilinx")
+    password = os.getenv("PYNQ_PASSWORD", "xilinx")
+    target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
     model = model.transform(DeployToPYNQ(ip, username, password, target_dir))
     pynq_ip = model.get_metadata_prop("pynq_ip")
     pynq_username = model.get_metadata_prop("pynq_username")
@@ -306,3 +306,4 @@ def test_fpgadataflow_ipstitch_remote_execution():
     x = gen_finn_dt_tensor(idt, (1, 4))
     input_dict = {"inp": x}
     outp = execute_onnx(model, input_dict)
+    print(outp)