diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index c0a3d55ce..1bcc7d25c 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -42,7 +42,7 @@ jobs:
           java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Configure Gradle properties
         run: |
@@ -67,7 +67,7 @@ jobs:
             ${{ runner.os }}-ccache-
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v4
 
       - name: Remove Android's cmake
         shell: bash
@@ -87,19 +87,19 @@ jobs:
           unzip zygisk/release/Vector-v*-Debug.zip -d Vector-Debug
 
       - name: Upload zygisk release
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.prepareArtifact.outputs.zygiskReleaseName }}
           path: "./Vector-Release/*"
 
       - name: Upload zygisk debug
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.prepareArtifact.outputs.zygiskDebugName }}
           path: "./Vector-Debug/*"
 
       - name: Upload mappings
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: mappings
           path: |
@@ -107,7 +107,7 @@ jobs:
             app/build/outputs/mapping
 
       - name: Upload symbols
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: symbols
           path: build/symbols
diff --git a/daemon/src/main/jni/logging.h b/daemon/src/main/jni/logging.h
index 86a7220ac..5ebf4ec24 100644
--- a/daemon/src/main/jni/logging.h
+++ b/daemon/src/main/jni/logging.h
@@ -36,8 +36,12 @@
 #define LOGE(...) 0
 #else
 #ifndef NDEBUG
-#define LOGD(fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
-#define LOGV(fmt, ...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
+#define LOGD(fmt, ...)                                                                             \
+    __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,                                                \
+                        "%s:%d#%s"                                                                 \
+                        ": " fmt,                                                                  \
+                        __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
 #define LOGD(...) 0
 #define LOGV(...) 0
diff --git a/dex2oat/src/main/cpp/include/logging.h b/dex2oat/src/main/cpp/include/logging.h
index ab66ef34c..36069bdd4 100644
--- a/dex2oat/src/main/cpp/include/logging.h
+++ b/dex2oat/src/main/cpp/include/logging.h
@@ -15,12 +15,12 @@
 #define LOGE(...) 0
 #else
 #ifndef NDEBUG
-#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define LOGV(fmt, ...)                                                                             \
-    __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG,                                              \
+#define LOGD(fmt, ...)                                                                             \
+    __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG,                                                \
                         "%s:%d#%s"                                                                 \
                         ": " fmt,                                                                  \
                         __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #else
 #define LOGD(...) 0
 #define LOGV(...) 0
diff --git a/native/include/common/logging.h b/native/include/common/logging.h
index 25533e4fb..a06585bc5 100644
--- a/native/include/common/logging.h
+++ b/native/include/common/logging.h
@@ -77,14 +77,13 @@ inline void LogToAndroid(int prio, const char *tag, fmt::format_string<T...> fmt
 }  // namespace vector::native::detail
 
 #ifndef NDEBUG
-#define LOGV(fmt, ...)                                                                             \
-    ::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG, "{}:{} ({}): " fmt,       \
-                                           __FILE_NAME__, __LINE__,                                \
-                                           __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
 #define LOGD(fmt, ...)                                                                             \
     ::vector::native::detail::LogToAndroid(ANDROID_LOG_DEBUG, LOG_TAG, "{}:{} ({}): " fmt,         \
                                            __FILE_NAME__, __LINE__,                                \
                                            __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
+#define LOGV(fmt, ...)                                                                             \
+    ::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG,                           \
+                                           fmt __VA_OPT__(, ) __VA_ARGS__)
 #else
 #define LOGV(...) ((void)0)
 #define LOGD(...) ((void)0)