diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5b6a478..f1c5be0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -13,15 +13,9 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
-    - name: Checkout submodules
-      run: |
-        git submodule init
-        git submodule update
-
-
-    - name: Install Dependencies
+    - name: Install gnuplot and gfortran
       run: |
         sudo apt install -y gnuplot
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
@@ -34,14 +28,31 @@ jobs:
       with:
         format: 'YYYY-MM'
 
-    - name: Build
+    - name: Setup cache for stack to speed up fpm build
+      id: cache
+      uses: actions/cache@v2
+      with:
+        path: "/home/runner/.stack/"
+        key: ${{ steps.time.outputs.time }}
+
+    - name: Install fpm
       run: |
-        mkdir build
-        cd build
-        cmake ..
-        make
+        git init fpm
+        git -C fpm fetch https://github.com/fortran-lang/fpm.git ffd95a4179276d49fd4d2a277c2eba905dc43b7a
+        git -C fpm checkout -qf FETCH_HEAD
+        cd fpm/bootstrap
+        stack build
+        stack install
+
+    - name: put fpm to PATH
+      run: |
+          sudo cp /home/runner/.local/bin/fpm /usr/local/bin
+
+    - name: Build
+      run: fpm build
 
     - name: Run tests
-      run: |
-        cd build
-        ctest -V
+      run: fpm test
+
+    - name: Generate Graphs
+      run: ./generate_graphs.sh