diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml
index d57df1e..8e775cc 100644
--- a/.github/workflows/ghpages.yml
+++ b/.github/workflows/ghpages.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: 'Upload the artifacts'
       if: github.ref_name == env.GIT_LATEST_TAG
-      uses: actions/upload-pages-artifact@v4
+      uses: actions/upload-pages-artifact@v5
       with:
         path: "_build/doc/html-out"
 
diff --git a/Android.bp b/Android.bp
index d973925..e1b1cc2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -125,6 +125,12 @@ cc_library_shared {
         x86_64: {
             cflags: ["-DVA_DRIVERS_PATH=\"/vendor/lib64\""],
         },
+        arm: {
+            cflags: ["-DVA_DRIVERS_PATH=\"/vendor/lib/dri\""],
+        },
+        arm64: {
+            cflags: ["-DVA_DRIVERS_PATH=\"/vendor/lib64/dri\""],
+        },
     },
 
     vendor: true,
diff --git a/va/va.c b/va/va.c
index 945c45e..3113b35 100644
--- a/va/va.c
+++ b/va/va.c
@@ -362,12 +362,10 @@ static char *va_getDriverPath(const char *driver_dir, const char *driver_name)
     char *driver_path = (char *) malloc(PATH_MAX);
     if (!driver_path)
         return NULL;
-    if (strcmp(driver_name, "iHD") && strcmp(driver_name, "i965")) {
-        n = snprintf(driver_path, PATH_MAX, "%s/libgallium_dri.so", driver_dir);
-    } else {
-        n = snprintf(driver_path, PATH_MAX, DRIVER_PATH_STRING,
-                     driver_dir, driver_name, DRIVER_EXTENSION);
-    }
+
+    n = snprintf(driver_path, PATH_MAX, DRIVER_PATH_STRING,
+                 driver_dir, driver_name, DRIVER_EXTENSION);
+
     if (n < 0) {
         free(driver_path);
         return NULL;