diff --git a/.github/workflows/daedalus-docker.yml b/.github/workflows/daedalus-docker.yml
index f3e5a2d7..8f5e0820 100644
--- a/.github/workflows/daedalus-docker.yml
+++ b/.github/workflows/daedalus-docker.yml
@@ -17,6 +17,9 @@ on:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./apps/daedalus
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -37,8 +40,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          context: .
-          file: ./Dockerfile
+          context: ./apps/daedalus
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
diff --git a/apps/app/package.json b/apps/app/package.json
index 9ed027b2..8a525953 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@modrinth/app-frontend": "workspace:*",
-    "@modrinth/app-lib": "workspace:*"
+    "@modrinth/app-lib": "workspace:*",
+    "@modrinth/daedalus": "workspace:*"
   }
 }
\ No newline at end of file
diff --git a/apps/daedalus_client/package.json b/apps/daedalus_client/package.json
index 41c8b0ae..71fb2ebb 100644
--- a/apps/daedalus_client/package.json
+++ b/apps/daedalus_client/package.json
@@ -6,5 +6,8 @@
     "fix": "cargo fmt && cargo clippy --fix",
     "dev": "cargo run",
     "test": "cargo test"
+  },
+  "dependencies": {
+    "@modrinth/daedalus": "workspace:*"
   }
 }
\ No newline at end of file
diff --git a/packages/daedalus/package.json b/packages/daedalus/package.json
index 41c8b0ae..f01a24e9 100644
--- a/packages/daedalus/package.json
+++ b/packages/daedalus/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@modrinth/daedalus_client",
+  "name": "@modrinth/daedalus",
   "scripts": {
     "build": "cargo build --release",
     "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8e11b168..a76e4287 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -31,6 +31,9 @@ importers:
       '@modrinth/app-lib':
         specifier: workspace:*
         version: link:../../packages/app-lib
+      '@modrinth/daedalus':
+        specifier: workspace:*
+        version: link:../../packages/daedalus
     devDependencies:
       '@tauri-apps/cli':
         specifier: 2.0.0-rc.16
@@ -150,6 +153,12 @@ importers:
 
   apps/app-playground: {}
 
+  apps/daedalus_client:
+    dependencies:
+      '@modrinth/daedalus':
+        specifier: workspace:*
+        version: link:../../packages/daedalus
+
   apps/docs:
     dependencies:
       '@astrojs/check':
@@ -311,6 +320,8 @@ importers:
         specifier: ^3.4.31
         version: 3.4.31(typescript@5.5.4)
 
+  packages/daedalus: {}
+
   packages/eslint-config-custom:
     devDependencies:
       '@nuxtjs/eslint-config-typescript':
@@ -10393,12 +10404,12 @@ snapshots:
   '@types/eslint-scope@3.7.7':
     dependencies:
       '@types/eslint': 9.6.0
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
     optional: true
 
   '@types/eslint@9.6.0':
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
       '@types/json-schema': 7.0.15
     optional: true
 
@@ -17169,7 +17180,7 @@ snapshots:
   webpack@5.92.1:
     dependencies:
       '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
       '@webassemblyjs/ast': 1.12.1
       '@webassemblyjs/wasm-edit': 1.12.1
       '@webassemblyjs/wasm-parser': 1.12.1