diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index d359db6c..68e230e1 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -153,7 +153,6 @@ jobs:
           export VERSION=$CUTTER_VERSION
           ninja install
           "../scripts/appimage_embed_python.sh" appdir
-          # "../scripts/rz-ghidra.sh" -DCMAKE_INSTALL_PREFIX="`pwd`/appdir/usr" -DBUILD_CUTTER_PLUGIN=ON -DCUTTER_SOURCE_DIR="`pwd`/.."
           APP_PREFIX=`pwd`/appdir/usr
           # export LD_LIBRARY_PATH=${APP_PREFIX}/lib:$Shiboken2_ROOT/lib
           export PATH=$PATH:${APP_PREFIX}/bin
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index 9deaa554..24a338be 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -81,10 +81,10 @@ if(APPLE)
 	get_filename_component(QT_PREFIX "${MACDEPLOYQT_PATH}/../.." ABSOLUTE)
 	list(APPEND RZ_GHIDRA_PREFIX_PATH "${QT_PREFIX}")
 	set(RIZIN_INSTALL_PLUGDIR "share/rizin/plugins") # escaped backslash on purpose, should be evaluated later
-	
+
 	if (CUTTER_PACKAGE_JSDEC AND CUTTER_ENABLE_DEPENDENCY_DOWNLOADS)
 		install(CODE "
-			execute_process(COMMAND \"${CMAKE_CURRENT_SOURCE_DIR}/../scripts/jsdec.sh\" --prefix=\${CMAKE_INSTALL_PREFIX} 
+			execute_process(COMMAND \"${CMAKE_CURRENT_SOURCE_DIR}/../scripts/jsdec.sh\" --prefix=\${CMAKE_INSTALL_PREFIX}
 								\"-Drizin_incdir=\${CMAKE_INSTALL_PREFIX}/include/librz\"
 								\"-Drizin_libdir=\${CMAKE_INSTALL_PREFIX}/lib\"
 							WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@@ -109,7 +109,8 @@ if(CUTTER_PACKAGE_RZ_GHIDRA)
 		# installed Cutter.
 		ExternalProject_Add(rz-ghidra
 			GIT_REPOSITORY https://github.com/rizinorg/rz-ghidra
-			GIT_TAG rz-0.1.1
+			GIT_TAG v0.2.0
+			#GIT_SHALLOW ON # disable this line when using commit hash
 			CONFIGURE_COMMAND ""
 			BUILD_COMMAND ""
 			INSTALL_COMMAND ""
diff --git a/dist/bundle_jsdec.ps1 b/dist/bundle_jsdec.ps1
index 3c6c1fb3..a2e1834c 100644
--- a/dist/bundle_jsdec.ps1
+++ b/dist/bundle_jsdec.ps1
@@ -2,7 +2,7 @@ $dist = $args[0]
 $python = Split-Path((Get-Command python.exe).Path)
 
 if (-not (Test-Path -Path 'jsdec' -PathType Container)) {
-    git clone https://github.com/rizinorg/jsdec.git --branch v0.1.x --depth 1
+    git clone https://github.com/rizinorg/jsdec.git --branch v0.2.x --depth 1
 }
 cd jsdec
 & meson.exe --buildtype=release -Dc_args=-DDUK_USE_DATE_NOW_WINDOWS --prefix=$dist --libdir=lib\plugins --datadir=lib\plugins p build
diff --git a/scripts/appveyor_rz-ghidra.sh b/scripts/appveyor_rz-ghidra.sh
deleted file mode 100755
index d5eff641..00000000
--- a/scripts/appveyor_rz-ghidra.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-scripts/rz-ghidra.sh \
-	-DCMAKE_C_COMPILER=cl \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_PREFIX_PATH="$APPVEYOR_BUILD_FOLDER/rz_dist;$APPVEYOR_BUILD_FOLDER/rz_dist/include/librz;$APPVEYOR_BUILD_FOLDER/rz_dist/include/librz/sdb" \
-	-DCMAKE_INSTALL_PREFIX="$APPVEYOR_BUILD_FOLDER/rz_dist" \
-	-DRIZIN_INSTALL_PLUGDIR="$APPVEYOR_BUILD_FOLDER/rz_dist/lib/plugins" \
-	-DBUILD_SLEIGH_PLUGIN=OFF
diff --git a/scripts/jsdec.sh b/scripts/jsdec.sh
index 421ff3df..95398e24 100755
--- a/scripts/jsdec.sh
+++ b/scripts/jsdec.sh
@@ -7,7 +7,7 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "$SCRIPTPATH/.."
 
 if [[ ! -d jsdec ]]; then
-	git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch v0.1.x
+	git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch v0.2.x
 fi
 
 cd jsdec
diff --git a/scripts/rz-ghidra.sh b/scripts/rz-ghidra.sh
deleted file mode 100755
index 2f255112..00000000
--- a/scripts/rz-ghidra.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
-
-cd "$SCRIPTPATH/.."
-
-if [[ ! -d rz-ghidra ]]; then
-    # remove depth, branch and uncomment lines below to use specifc commit
-
-    git clone --recurse-submodules https://github.com/rizinorg/rz-ghidra.git --depth 1 --branch master || exit 1
-
-    #pushd rz-ghidra
-    #git checkout  --recurse-submodules 5e845f4b50e8559bd51af03b22b6586e8cc5c35c
-    #popd
-fi
-cd rz-ghidra || exit 1
-
-mkdir build && cd build || exit 1
-cmake -G Ninja "$@" .. || exit 1
-ninja || exit 1
-ninja install || exit 1
-