diff --git a/extras/scripts/make_patch.sh b/extras/scripts/make_patch.sh
index 3a645545..e944ec82 100755
--- a/extras/scripts/make_patch.sh
+++ b/extras/scripts/make_patch.sh
@@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null
 SCRIPTPATH=`pwd`
 popd > /dev/null
 
-# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch
-CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch
+CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
 
 # Set environment variables for python
 export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch
diff --git a/extras/scripts/modify_patch.sh b/extras/scripts/modify_patch.sh
index 91cdff2c..2155ee68 100755
--- a/extras/scripts/modify_patch.sh
+++ b/extras/scripts/modify_patch.sh
@@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null
 SCRIPTPATH=`pwd`
 popd > /dev/null
 
-# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch
-CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch
+CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
 
 # Set environment variables for python
 export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch
diff --git a/extras/scripts/patch_build.sh b/extras/scripts/patch_build.sh
index e1f4cd00..6dc9e9aa 100755
--- a/extras/scripts/patch_build.sh
+++ b/extras/scripts/patch_build.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 
-CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch
+pushd `dirname $0` > /dev/null
+SCRIPTPATH=`pwd`
+popd > /dev/null
+
+CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
 
 # Source release-info
-. $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc
+. $SCRIPTPATH/../../middleware/recipes-common/build-info/release-info.inc
 export PLATFORM_RELEASE
 
 # Set environment variables for python
diff --git a/extras/scripts/query_patch.sh b/extras/scripts/query_patch.sh
index be89ce30..dbee355c 100755
--- a/extras/scripts/query_patch.sh
+++ b/extras/scripts/query_patch.sh
@@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null
 SCRIPTPATH=`pwd`
 popd > /dev/null
 
-# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch
-CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch
+CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
 
 # Set environment variables for python
 export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch