diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index a188db2e89..dcb250a0f5 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -79,8 +79,17 @@ jobs:
         ls -la ./libs/arm64-v8a/
         cp ./libs/arm64-v8a/libnnstreamer.so $GSTREAMER_ROOT_ANDROID/arm64/lib/gstreamer-1.0/
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./libs/arm64-v8a
+
+        # Workaround for the gstreamer-android prebuild binary build glitches
+        result=$(readelf -d ~/android/gst_root_android/arm64/lib/libfontconfig.so | grep "/data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/lib")
+        if [[ ! -z $result ]]; then
+          echo "Warning: the given prebuilt binaries for Android have incorrect rpaths."
+          sudo mkdir -p /data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/
+          sudo ln -s $ORGP/android/gst_root_android/arm64/lib /data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/lib
+        fi
+
         echo "::group::Build a test application"
-        LDFLAGS+="-L~/android/gst_root_android/arm64/lib" ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android-app.mk NDK_APPLICATION_MK=./Application.mk -j$(nproc)
+        ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android-app.mk NDK_APPLICATION_MK=./Application.mk -j$(nproc)
         ls -la /data/nnstreamer/cerbero.custom-1.12.4-ndkr12b-20190213-0900/build/dist/android_arm64/lib/
         echo "::endgroup::"
         cd ..
diff --git a/.github/workflows/yocto.yml b/.github/workflows/yocto.yml
index e85ce205db..7f8d3928e2 100644
--- a/.github/workflows/yocto.yml
+++ b/.github/workflows/yocto.yml
@@ -1,8 +1,8 @@
-name: Yocto build
+name: Yocto build (disabled)
 
 on:
-  pull_request:
-    branches: [ main ]
+#  pull_request:
+#    branches: [ main ]
 
 jobs:
   build: