diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 18bb4fc5e13..2754253c8a8 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -3,6 +3,7 @@ self-hosted-runner:
   labels:
     - macos-14  # can be removed once actionlint is updated
     - ubuntu-24.04  # can be removed once actionlint is updated
+    - MapLibre_Native_Ubuntu_22_04_ARM_8_core
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
 # Empty array means no configuration variable is allowed.
diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index ddb4cfe7485..5a41e4446b4 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -76,7 +76,7 @@ jobs:
         include:
           - runs-on: ubuntu-22.04
             arch: x86_64
-          - runs-on: [self-hosted, linux, ARM64]
+          - runs-on: MapLibre_Native_Ubuntu_22_04_ARM_8_core
             arch: arm64
           - runs-on: macos-14
             arch: arm64
diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml
index d378e94369e..2c58e475e18 100644
--- a/.github/workflows/node-release.yml
+++ b/.github/workflows/node-release.yml
@@ -46,7 +46,7 @@ jobs:
         include:
           - runs-on: ubuntu-22.04
             arch: x86_64
-          - runs-on: [self-hosted, linux, ARM64]
+          - runs-on: MapLibre_Native_Ubuntu_22_04_ARM_8_core
             arch: arm64
           - runs-on: macos-14
             arch: arm64
diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp
index 46f3913b065..c06b50a6a75 100644
--- a/test/util/memory.test.cpp
+++ b/test/util/memory.test.cpp
@@ -34,7 +34,7 @@ class MemoryTest {
 public:
     MemoryTest() {
         fileSource->styleResponse = [&](const Resource& res) {
-            auto resName = "style_" + getType(res) + ".json";
+            auto resName = std::string("style_") + getType(res) + ".json";
             return response(resName);
         };
         fileSource->tileResponse = [&](const Resource& res) {
@@ -42,7 +42,7 @@ class MemoryTest {
             return response(resName);
         };
         fileSource->sourceResponse = [&](const Resource& res) {
-            auto resName = "source_" + getType(res) + ".json";
+            auto resName = std::string("source_") + getType(res) + ".json";
             return response(resName);
         };
         fileSource->glyphsResponse = [&](const Resource&) {