diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d30661c..7ab10e56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,8 +4,9 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    container: zephyrprojectrtos/ci:latest
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:latest
     env:
       CMAKE_PREFIX_PATH: /opt/toolchains
     steps:
@@ -20,8 +21,6 @@ jobs:
           west init -m https://github.com/zephyrproject-rtos/gsoc-2022-arduino-core.git
           west update
           git clone https://github.com/arduino/ArduinoCore-API.git ArduinoCore-API
-          sed '/WCharacter.h/ s/./\/\/ &/' ArduinoCore-API/api/ArduinoAPI.h > ArduinoCore-API/api/tmpArduinoAPI.h
-          mv ArduinoCore-API/api/tmpArduinoAPI.h ArduinoCore-API/api/ArduinoAPI.h
           cp -r ArduinoCore-API/api modules/lib/Arduino-Zephyr-API/cores/arduino/.
 
       - name: Build fade
@@ -34,8 +33,8 @@ jobs:
         run: |
           west build -p -b arduino_nano_33_ble_sense samples/i2cdemo
 
-      - name: Archive firmware
-        uses: actions/upload-artifact@v2
-        with:
-          name: firmware
-          path: Arduino-Zephyr-API/build/zephyr/zephyr.*
+      - name: Build adc
+        working-directory: Arduino-Zephyr-API
+        run: |
+          west build -p -b beagleconnect_freedom samples/analog_input
+
diff --git a/.github/workflows/checkpatch.yml b/.github/workflows/checkpatch.yml
index c3cba500..41e2f69b 100644
--- a/.github/workflows/checkpatch.yml
+++ b/.github/workflows/checkpatch.yml
@@ -6,9 +6,9 @@ name: checkpatch review
 on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   push:
-    branches: [ "main" ]
+    branches: [ "main", "next" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "next" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/.github/workflows/rm-old.yml b/.github/workflows/rm-old.yml
new file mode 100644
index 00000000..6a906d30
--- /dev/null
+++ b/.github/workflows/rm-old.yml
@@ -0,0 +1,21 @@
+name: Remove old artifacts
+
+on:
+  push:
+    branches: [ "main", "next" ]
+  pull_request:
+    branches: [ "main", "next" ]
+
+jobs:
+  remove-old-artifacts:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+    - name: Remove old artifacts
+      uses: c-hive/gha-remove-artifacts@v1
+      with:
+        age: '2 days' # '<number> <unit>', e.g. 5 days, 2 years, 90 seconds, parsed by Moment.js
+        # Optional inputs
+        # skip-tags: true
+        # skip-recent: 5