diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 5aaaed7..ff952a0 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -16,12 +16,22 @@ jobs:
         with:
           update: true
           install: base-devel git
+          msystem: MINGW64
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Move files to temporary location
-        run: pwd && whoami
-      - name: Download and unzip openFrameworks
+      - name: Download openFrameworks and add ofxPiMapper to addons
         run: |
-          curl --help
-          echo ${OF_URL}
+          mkdir .ofxPiMapper
+          mv ./* .ofxPiMapper/
+          wget ${OF_URL} --tries=10 --quiet
+          echo "Unarchive openFrameworks"
+          OF_ARCHIVE_NAME=$(basename -- "$OF_URL")
+          tar -xf ${OF_ARCHIVE_NAME}
+          rm ${OF_ARCHIVE_NAME}
+          OF_EXTRACT_NAME=$(basename ${OF_ARCHIVE_NAME} .tar.gz)
+          mv ${OF_EXTRACT_NAME} openFrameworks
+          mv .ofxPiMapper openFrameworks/addons/ofxPiMapper
+      - name: Install openFrameworks Dependencies
+        working-directory: ./openFrameworks/scripts/msys2
+        run: ./install_dependencies.sh