diff --git a/base/build b/base/build
index b8b8487..ba1bdc7 100755
--- a/base/build
+++ b/base/build
@@ -6,4 +6,4 @@ DOCKER_BUILDKIT=1 \
 docker build . \
     --build-arg addpkg=${addpkg:-""} \
     --build-arg debug=${debug:-""} \
-    --tag ${buildtag:-myvnc/base}
\ No newline at end of file
+    --tag ${buildtag:-myvnc/alpine/base}
diff --git a/firefox/Dockerfile b/firefox/Dockerfile
index 807c494..fbcc8e5 100644
--- a/firefox/Dockerfile
+++ b/firefox/Dockerfile
@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1
-FROM myvnc/base:i3
+FROM myvnc/alpine/i3
 USER root
 
 # Build ARG: use "root" for debugging
diff --git a/firefox/docker-compose.yaml b/firefox/docker-compose.yaml
index fe54105..625152a 100644
--- a/firefox/docker-compose.yaml
+++ b/firefox/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   firefox:
-    image: myvnc/firefox
+    image: myvnc/alpine/firefox
     container_name: firefox
     restart: unless-stopped
     build: .
diff --git a/i3/Dockerfile b/i3/Dockerfile
index d5edb27..9765e44 100644
--- a/i3/Dockerfile
+++ b/i3/Dockerfile
@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1
-FROM myvnc/base
+FROM myvnc/alpine/base
 USER root
 
 # Build ARG: use "root" for debugging
diff --git a/i3/build b/i3/build
index afe01d5..0c0df63 100755
--- a/i3/build
+++ b/i3/build
@@ -4,4 +4,4 @@
 DOCKER_BUILDKIT=1 \
 docker build . \
     --build-arg debug=${debug:-""} \
-    --tag ${buildtag:-myvnc/base:i3}
\ No newline at end of file
+    --tag ${buildtag:-myvnc/alpine/i3}
\ No newline at end of file