diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e32380..876223a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -169,7 +169,7 @@ jobs:
       - name: Compile GResource
         run: |
           mkdir -p target/${{ matrix.target }}/release/
-          glib-compile-resources --sourcedir src --target target/${{ matrix.target }}/release/aardvark.gresource aardvark-app/src/aardvark.gresource.xml
+          glib-compile-resources --sourcedir aardvark-app/src --target target/${{ matrix.target }}/release/aardvark.gresource aardvark-app/src/aardvark.gresource.xml
 
       - name: Create App Bundle
         run: |
diff --git a/Cargo.toml b/Cargo.toml
index 766e3bb..57f5326 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
-
+resolver = "2"
 members = ["aardvark-app", "aardvark-node"]
diff --git a/aardvark-app/src/meson.build b/aardvark-app/src/meson.build
index 137b2ef..0a088d0 100644
--- a/aardvark-app/src/meson.build
+++ b/aardvark-app/src/meson.build
@@ -30,7 +30,7 @@ run_command(
 
 cargo_bin  = find_program('cargo')
 cargo_opt  = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
-cargo_opt += [ '--target-dir', meson.project_build_root()  / 'src' ]
+cargo_opt += [ '--target-dir', meson.project_build_root()  / 'aardvark-app/src' ]
 cargo_env  = [ 'CARGO_HOME=' + meson.project_build_root()  / 'cargo-home' ]
 
 if get_option('buildtype') == 'release'
@@ -51,6 +51,6 @@ cargo_build = custom_target(
   command: [
     'env', cargo_env,
     cargo_bin, 'build',
-    cargo_opt, '&&', 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
+    cargo_opt, '&&', 'cp', 'aardvark-app/src' / rust_target / meson.project_name(), '@OUTPUT@',
   ]
 )