diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cceb99f..7d8102f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,10 +10,14 @@ jobs:
       options: --privileged
     steps:
     - uses: actions/checkout@v2
-    - uses: bilelmoussaoui/flatpak-github-actions@v2
+    - uses: bilelmoussaoui/flatpak-github-actions@v3
       with:
         bundle: "com.github.danrabbit.harvey.flatpak"
         manifest-path: "com.github.danrabbit.harvey.yml"
+        run-tests: true
+        repository-name: elementary
+        repository-url: https://flatpak.elementary.io/elementary.flatpakrepo
+        cache-key: "flatpak-builder-${{ github.sha }}"
 
   lint:
     runs-on: ubuntu-latest
diff --git a/com.github.danrabbit.harvey.yml b/com.github.danrabbit.harvey.yml
index fe5464e..5200488 100644
--- a/com.github.danrabbit.harvey.yml
+++ b/com.github.danrabbit.harvey.yml
@@ -1,9 +1,7 @@
 app-id: com.github.danrabbit.harvey
-runtime: org.gnome.Platform
-runtime-version: '3.36'
-base: io.elementary.BaseApp
-base-version: juno-19.08
-sdk: org.gnome.Sdk
+runtime: io.elementary.Platform
+runtime-version: 'daily'
+sdk: io.elementary.Sdk
 command: com.github.danrabbit.harvey
 finish-args:
   - '--share=ipc'
@@ -15,13 +13,6 @@ finish-args:
 
   - '--metadata=X-DConf=migrate-path=/com/github/danrabbit/harvey/'
 modules:
-  - name: handy
-    buildsystem: meson
-    sources:
-      - type: git
-        url: https://gitlab.gnome.org/GNOME/libhandy.git
-        tag: '1.0.0'
-
   - name: harvey
     buildsystem: meson
     sources: