diff --git a/.github/workflows/arduino_ci.yml b/.github/workflows/arduino_ci.yml
index 6a48edc3..86a96db5 100644
--- a/.github/workflows/arduino_ci.yml
+++ b/.github/workflows/arduino_ci.yml
@@ -38,7 +38,6 @@ jobs:
 
         include:
         - lib: "magnetic-angle-sensor"
-        - workspace: "Arduino/libraries"
 
         - platform: "arduino:avr"
           fqbn: arduino:avr:uno
@@ -57,9 +56,10 @@ jobs:
       - name: Set and check environment, install repos
         run: |
           ln -sfn /opt/XMC-for-Arduino ~/.arduino15/packages/Infineon
-          mkdir -p "$HOME/${{ matrix.workspace }}"
-          export
-          ln -sf $GITHUB_WORKSPACE/ $HOME/${{ matrix.workspace }}/${{ matrix.lib }}
+          mkdir -p "$HOME/Arduino/libraries"
+          export REPO="$(basename "$GITHUB_REPOSITORY")"
+          echo $REPO
+          ln -sf $GITHUB_WORKSPACE/ $HOME/Arduino/libraries/${{ matrix.lib }}
 
       # Update the arduino code. Attention this does not setup XMC packages as this are set inside the selfhosted runner
       - name: Install/Update Arduino Platform
@@ -69,7 +69,7 @@ jobs:
 
       - name: Compile Sketch
         run: |
-          arduino-cli compile --fqbn ${{ matrix.fqbn }} --libraries="." --libraries="$HOME/${{ matrix.workspace }}/." ${{ matrix.example }}
+          arduino-cli compile --fqbn ${{ matrix.fqbn }} --libraries="." --libraries="$HOME/Arduino/libraries/." ${{ matrix.example }}
 
   deploy:
 
@@ -113,9 +113,9 @@ jobs:
       - name: Compile Sketch
         run: |
           ln -sfn /opt/XMC-for-Arduino ~/.arduino15/packages/Infineon
-          mkdir -p "$HOME/${{ matrix.workspace }}"
-          ln -sf $GITHUB_WORKSPACE/ $HOME/${{ matrix.workspace }}/${{ matrix.lib }}
-          arduino-cli compile --fqbn ${{ matrix.fqbn }} --libraries="." --libraries="$HOME/${{ matrix.workspace }}/." ${{ matrix.example }} --export-binaries
+          mkdir -p "$HOME/Arduino/libraries"
+          ln -sf $GITHUB_WORKSPACE/ $HOME/Arduino/libraries/${{ matrix.lib }}
+          arduino-cli compile --fqbn ${{ matrix.fqbn }} --libraries="." --libraries="$HOME/Arduino/libraries/." ${{ matrix.example }} --export-binaries
   
       - name: Deploy
         run: |
@@ -126,4 +126,4 @@ jobs:
           echo $PORT
           echo $DEVICE
           cd $HOME
-          python $HOME/.arduino15/packages/Infineon/hardware/xmc/3.0.0/tools/xmc-flasher.py upload -d $DEVICE -p $PORT -f $HOME/${{ matrix.workspace }}/${{ matrix.lib }}/${{ matrix.example }}/build/Infineon.xmc.XMC1100_XMC2GO/*.hex
+          python $HOME/.arduino15/packages/Infineon/hardware/xmc/3.0.0/tools/xmc-flasher.py upload -d $DEVICE -p $PORT -f $HOME/Arduino/libraries/${{ matrix.lib }}/${{ matrix.example }}/build/Infineon.xmc.XMC1100_XMC2GO/*.hex