diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..0533983
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/devcontainers/go:2-1.24-bookworm
+
+RUN apt-get update && apt install -y libmpv-dev gcc libegl1-mesa-dev xorg-dev
+
+USER vscode
+RUN go install fyne.io/fyne/v2/cmd/fyne@latest
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0b8985f..dd70d14 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,23 +2,22 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/go .
 {
 	"name": "Supersonic",
-	"image": "mcr.microsoft.com/devcontainers/go:2-1.24-bookworm",
+	"dockerFile": "Dockerfile",
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {
 		"desktop-lite": {
 			"password": "your_password",
 			"webPort": "6080",
 			"vncPort": "5901"
-		}
+		},
 	},
 	"containerEnv": {
 		"VNC_RESOLUTION": "1920x1080x24",
 	},
 	"onCreateCommand": {
 		"log": "echo 'Starting post-create script...'",
-		"apt": "sudo .devcontainer/init-apt.sh",
 		"go": ".devcontainer/init-go.sh",
 		"config": "bash -c 'mkdir -p ~/.config/supersonic && (cp .devcontainer/custom-config.toml ~/.config/supersonic/config.toml 2> /dev/null || cp .devcontainer/default-config.toml ~/.config/supersonic/config.toml)'",
-		"keyring": "bash -c 'echo \"source $(pwd)/.devcontainer/init-keychain.sh\" >> /home/vscode/.bashrc'",
+		"keyring": "bash -c '.devcontainer/init-keychain.sh'",
 	},
 }
\ No newline at end of file
diff --git a/.devcontainer/init-apt.sh b/.devcontainer/init-apt.sh
deleted file mode 100755
index 64880b7..0000000
--- a/.devcontainer/init-apt.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-apt update
-apt install -y libmpv-dev gcc libegl1-mesa-dev xorg-dev
\ No newline at end of file
diff --git a/.devcontainer/init-go.sh b/.devcontainer/init-go.sh
index c8c753d..cc26d04 100755
--- a/.devcontainer/init-go.sh
+++ b/.devcontainer/init-go.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-go install fyne.io/fyne/v2/cmd/fyne@latest
+# handled by Dockerfile
+# go install fyne.io/fyne/v2/cmd/fyne@latest
+
 go get
\ No newline at end of file
diff --git a/.devcontainer/init-keychain.sh b/.devcontainer/init-keychain.sh
index 4f61449..ebc7fad 100755
--- a/.devcontainer/init-keychain.sh
+++ b/.devcontainer/init-keychain.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
-
-eval "$(dbus-launch --sh-syntax)"
-eval "$(printf '\n' | gnome-keyring-daemon --unlock)"
\ No newline at end of file
+#!/bin/sh
+mkdir -p /home/vscode/.local/share/keyrings
+cp .devcontainer/login.keyring /home/vscode/.local/share/keyrings
\ No newline at end of file
diff --git a/.devcontainer/login.keyring b/.devcontainer/login.keyring
new file mode 100644
index 0000000..fe238d5
--- /dev/null
+++ b/.devcontainer/login.keyring
@@ -0,0 +1,23 @@
+[keyring]
+display-name=login
+ctime=1763913973
+mtime=0
+lock-on-idle=false
+lock-after=false
+
+[1]
+item-type=0
+display-name=Password for 'f9056891-50cc-4161-9e27-f50f3db32a8c' on 'supersonic'
+secret=demo
+mtime=1763914175
+ctime=1763914175
+
+[1:attribute0]
+name=service
+type=string
+value=supersonic
+
+[1:attribute1]
+name=username
+type=string
+value=f9056891-50cc-4161-9e27-f50f3db32a8c