diff --git a/cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh b/cmake/scripts/Q7S/q7s-env-win.sh
similarity index 100%
rename from cmake/scripts/Q7S/win_path_helper_xilinx_tools.sh
rename to cmake/scripts/Q7S/q7s-env-win.sh
diff --git a/cmake/scripts/Q7S/q7s-env.sh b/cmake/scripts/Q7S/q7s-env.sh
new file mode 100755
index 00000000..818ff213
--- /dev/null
+++ b/cmake/scripts/Q7S/q7s-env.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -i
+export PATH=$PATH:"$HOME/EIVE/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
+export CROSS_COMPILE="arm-linux-gnueabihf"
+
+export Q7S_SYSROOT="$HOME/Xilinx/cortexa9hf-neon-xiphos-linux-gnueabi"
+export CONSOLE_PREFIX="[Q7S ENV]"
+/bin/bash
diff --git a/cmake/scripts/Q7S/unix_path_helper.sh b/cmake/scripts/Q7S/unix_path_helper.sh
deleted file mode 100644
index 296bfdd8..00000000
--- a/cmake/scripts/Q7S/unix_path_helper.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export PATH=$PATH:"/opt/Xilinx/SDK/2018.2/gnu/aarch32/lin/gcc-arm-linux-gnueabi/bin"
-export CROSS_COMPILE="arm-linux-gnueabihf"
-
-export Q7S_SYSROOT="$HOME/Xilinx/cortexa9hf-neon-xiphos-linux-gnueabi"
-