diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b0108c3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "upstream"]
+	path = upstream
+	url = https://github.com/YaLTeR/niri.git
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 5addab9..e103721 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -1,5 +1,5 @@
 # use specific image if relevant (rust, golang)
-FROM ubuntu:24.04
+FROM rust:1.90
 
 RUN apt-get update && \
     apt-get install curl \
diff --git a/Makefile b/Makefile
index 254151d..690c943 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,19 @@
 
-package = mypackage.deb
+package = niri-main.deb
 
 .PHONY: compile
 compile:
-	cd upstream && echo compile
+	cd upstream && cargo build --release
 
 .PHONY: dpkg
 dpkg:
-	make -p deb-packagee/usr/bin/
-	cp upstream/bin deb-package/usr/bin/
+	make -p deb-packagee/usr/bin deb-packagee/usr/share/wayland-sessions deb-packagee/usr/share/xdg-desktop-portal /usr/lib/systemd/user
+	cp upstream/target/release/niri deb-package/usr/bin/
+	cp upstream/resources/niri-session deb-package/usr/bin/
+	cp upstream/resources/niri.desktop deb-package/usr/share/wayland-sessions/
+	cp upstream/resources/niri-portals.conf deb-package/usr/share/xdg-desktop-portal/
+	cp upstream/resources/niri.service deb-package/usr/lib/systemd/user/
+	cp upstream/resources/niri-shutdown.target deb-package/usr/lib/systemd/user/
 	chmod -R o-w deb-package/
 	sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control
 	sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control
diff --git a/deb-package/DEBIAN/control b/deb-package/DEBIAN/control
index 280352a..c7c52ea 100644
--- a/deb-package/DEBIAN/control
+++ b/deb-package/DEBIAN/control
@@ -1,12 +1,10 @@
-Package: mypackage-main
+Package: niri-main
 Version: 0.0.1~git%date%.%hash%-1
 Section: base
 Priority: optional
 Architecture: amd64
 Maintainer: pips <pips@e5150.fr>
-Homepage: https://example.com
+Homepage: https://forge.e5150.fr/ext/niri
 Suggests: suggeted-packages
-Depends: depends (>= X.Y.Z), packages (>= X.Y)
-Conflicts: package-from-official-repo
-Description: Description of mypackage
- Auto packaging of mypackage following main dev branch
+Description: niri build from main
+ Auto packaging of niri following main dev branch
diff --git a/upstream b/upstream
new file mode 160000
index 0000000..6451d6b
--- /dev/null
+++ b/upstream
@@ -0,0 +1 @@
+Subproject commit 6451d6be4f7046bd3d02bbe22dc50bb7b94235a5