diff --git a/apps/brave/Dockerfile b/apps/brave/Dockerfile
index 4a76e908..53c4745b 100644
--- a/apps/brave/Dockerfile
+++ b/apps/brave/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 RUN set -eux; apt-get update; \
diff --git a/apps/brave/Dockerfile.nvidia b/apps/brave/Dockerfile.nvidia
index 0ac80280..acd6da94 100644
--- a/apps/brave/Dockerfile.nvidia
+++ b/apps/brave/Dockerfile.nvidia
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:nvidia-base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 RUN set -eux; apt-get update; \
diff --git a/apps/chromium/Dockerfile b/apps/chromium/Dockerfile
index 70f4085d..4a3171f5 100644
--- a/apps/chromium/Dockerfile
+++ b/apps/chromium/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/chromium/Dockerfile.nvidia b/apps/chromium/Dockerfile.nvidia
index 752a7d98..8af30e5e 100644
--- a/apps/chromium/Dockerfile.nvidia
+++ b/apps/chromium/Dockerfile.nvidia
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/firefox/Dockerfile b/apps/firefox/Dockerfile
index 0b325365..b07b02b9 100644
--- a/apps/firefox/Dockerfile
+++ b/apps/firefox/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/firefox/Dockerfile.nvidia b/apps/firefox/Dockerfile.nvidia
index a43c5279..62df72f0 100644
--- a/apps/firefox/Dockerfile.nvidia
+++ b/apps/firefox/Dockerfile.nvidia
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"
diff --git a/apps/google-chrome/Dockerfile b/apps/google-chrome/Dockerfile
index 669c5ee1..04347401 100644
--- a/apps/google-chrome/Dockerfile
+++ b/apps/google-chrome/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG SRC_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
diff --git a/apps/google-chrome/Dockerfile.nvidia b/apps/google-chrome/Dockerfile.nvidia
index f96645b5..9dc778ee 100644
--- a/apps/google-chrome/Dockerfile.nvidia
+++ b/apps/google-chrome/Dockerfile.nvidia
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:nvidia-base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/nvidia-base:latest
 FROM $BASE_IMAGE
 
 # latest working version with EGL: 111.0.5563.146, revert when resolved
diff --git a/apps/kde/Dockerfile b/apps/kde/Dockerfile
index a96820b6..3ca3ba38 100644
--- a/apps/kde/Dockerfile
+++ b/apps/kde/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/microsoft-edge/Dockerfile b/apps/microsoft-edge/Dockerfile
index a291fad2..50724792 100644
--- a/apps/microsoft-edge/Dockerfile
+++ b/apps/microsoft-edge/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/"
diff --git a/apps/microsoft-edge/Dockerfile.nvidia b/apps/microsoft-edge/Dockerfile.nvidia
index 1ba67c18..177e8490 100644
--- a/apps/microsoft-edge/Dockerfile.nvidia
+++ b/apps/microsoft-edge/Dockerfile.nvidia
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/"
diff --git a/apps/opera/Dockerfile b/apps/opera/Dockerfile
index e02697d6..dc333e08 100644
--- a/apps/opera/Dockerfile
+++ b/apps/opera/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://download5.operacdn.com/pub/opera/desktop/"
diff --git a/apps/remmina/Dockerfile b/apps/remmina/Dockerfile
index e527c218..fae54608 100644
--- a/apps/remmina/Dockerfile
+++ b/apps/remmina/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 # install remmina
diff --git a/apps/tor-browser/Dockerfile b/apps/tor-browser/Dockerfile
index dd8c5bfc..8ded6895 100644
--- a/apps/tor-browser/Dockerfile
+++ b/apps/tor-browser/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/ungoogled-chromium/Dockerfile b/apps/ungoogled-chromium/Dockerfile
index 97a6cac1..d7ab45a3 100644
--- a/apps/ungoogled-chromium/Dockerfile
+++ b/apps/ungoogled-chromium/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG API_URL="https://api.github.com/repos/macchrome/linchrome/releases/latest"
diff --git a/apps/vivaldi/Dockerfile b/apps/vivaldi/Dockerfile
index e5972bc0..60a7f62c 100644
--- a/apps/vivaldi/Dockerfile
+++ b/apps/vivaldi/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/vlc/Dockerfile b/apps/vlc/Dockerfile
index aea2e1d6..02572d2f 100644
--- a/apps/vlc/Dockerfile
+++ b/apps/vlc/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/apps/waterfox/Dockerfile b/apps/waterfox/Dockerfile
index 49f4c66b..8d59e214 100644
--- a/apps/waterfox/Dockerfile
+++ b/apps/waterfox/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG SRC_URL="https://cdn1.waterfox.net/waterfox/releases/latest/linux"
diff --git a/apps/xfce/Dockerfile b/apps/xfce/Dockerfile
index b1aa6a7d..b9f45b0c 100644
--- a/apps/xfce/Dockerfile
+++ b/apps/xfce/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=m1k1o/neko:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 #
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8738b2b8..c8f81530 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,15 +1,14 @@
-version: "3.4"
 services:
   neko:
-    image: "m1k1o/neko:firefox"
+    image: "ghcr.io/m1k1o/neko/firefox:latest"
     restart: "unless-stopped"
     shm_size: "2gb"
     ports:
       - "8080:8080"
       - "52000-52100:52000-52100/udp"
     environment:
-      NEKO_SCREEN: 1920x1080@30
-      NEKO_PASSWORD: neko
-      NEKO_PASSWORD_ADMIN: admin
-      NEKO_EPR: 52000-52100
-      NEKO_ICELITE: 1
+      NEKO_DESKTOP_SCREEN: 1920x1080@30
+      NEKO_MEMBER_MULTIUSER_USER_PASSWORD: neko
+      NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD: admin
+      NEKO_WEBRTC_EPR: 52000-52100
+      NEKO_WEBRTC_ICELITE: 1
diff --git a/server/dev/runtime/Dockerfile b/server/dev/runtime/Dockerfile
index 0be6746f..4f17e645 100644
--- a/server/dev/runtime/Dockerfile
+++ b/server/dev/runtime/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=neko_server:base
+ARG BASE_IMAGE=ghcr.io/m1k1o/neko/base:latest
 FROM $BASE_IMAGE
 
 ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"