diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 1dccf7f..9a5b951 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -16,9 +16,6 @@ jobs:
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Authentication
         uses: docker/login-action@v2
         with:
@@ -29,9 +26,8 @@ jobs:
       - name: Build desktop base
         uses: docker/build-push-action@v4
         with:
-          push: false
-          load: true
-          tags: osicstacks-base-desktop
+          push: true
+          tags: git.1159.cl/mario1159/osicstacks-base-desktop
           platforms: linux/amd64
           context: .
           file: ./base/desktop.Dockerfile
@@ -39,9 +35,9 @@ jobs:
       - name: Build web base
         uses: docker/build-push-action@v4
         with:
-          push: false
-          load: true
-          tags: osicstacks-base-web
+          push: true
+          build-args: BASE_IMG=git.1159.cl/mario1159/osicstacks-base-desktop
+          tags: git.1159.cl/mario1159/osicstacks-base-web
           platforms: linux/amd64
           context: .
           file: ./base/web.Dockerfile
\ No newline at end of file
diff --git a/base/desktop.Dockerfile b/base/desktop.Dockerfile
index 08f7ce1..00c9dab 100644
--- a/base/desktop.Dockerfile
+++ b/base/desktop.Dockerfile
@@ -1,6 +1,6 @@
-# OSIC Stacks - osicstacks-base-arch
+# OSIC Stacks - osicstacks-base-desktop
 # Base image for OSIC Stacks
-FROM greyltc/archlinux-aur:paru
+FROM greyltc/archlinux-aur:paru as osicstacks-base-desktop
 
 # Update packages
 RUN pacman -Syuq --noconfirm
diff --git a/base/web.Dockerfile b/base/web.Dockerfile
index dfb2e5f..a6974b5 100644
--- a/base/web.Dockerfile
+++ b/base/web.Dockerfile
@@ -1,6 +1,7 @@
 # OSIC Stacks - osicstacks-base-web
 # Base image for OSIC Stacks
-FROM osicstacks-base-desktop
+ARG BASE_IMG=osicstacks-base-desktop
+FROM $BASE_IMG as osicstacks-base-web
 
 # Update packages
 RUN sudo pacman -Syuq --noconfirm
diff --git a/stacks/analog-heavy.Dockerfile b/stacks/analog-heavy.Dockerfile
index 421e97d..80bebab 100644
--- a/stacks/analog-heavy.Dockerfile
+++ b/stacks/analog-heavy.Dockerfile
@@ -1,6 +1,6 @@
 # OSIC Stacks - analog-heavy-arch
 # Dev enviroment for analog circuits development using xschem and klayout.
-ARG BASE_IMG=osicstacks-base-native
+ARG BASE_IMG=osicstacks-base-desktop
 FROM $BASE_IMG as analog-heavy
 
 # Update packages
diff --git a/stacks/analog-xk.Dockerfile b/stacks/analog-xk.Dockerfile
index c0962e5..54ac3c9 100644
--- a/stacks/analog-xk.Dockerfile
+++ b/stacks/analog-xk.Dockerfile
@@ -1,6 +1,6 @@
 # OSIC Stacks - analog-xk
 # Dev enviroment for analog circuits development using xschem and klayout.
-ARG BASE_IMG=osicstacks-base-native
+ARG BASE_IMG=osicstacks-base-desktop
 FROM $BASE_IMG as analog-xk
 
 # Update packages
diff --git a/stacks/analog-xm.Dockerfile b/stacks/analog-xm.Dockerfile
index 6706ff7..7bcae85 100644
--- a/stacks/analog-xm.Dockerfile
+++ b/stacks/analog-xm.Dockerfile
@@ -1,6 +1,6 @@
 # OSIC Stacks - analog-xm
 # Dev enviroment for analog circuits development using xschem and magic.
-ARG BASE_IMG=osicstacks-base-native
+ARG BASE_IMG=osicstacks-base-desktop
 FROM $BASE_IMG as analog-xm
 
 # Update packages
diff --git a/stacks/digital-ator.Dockerfile b/stacks/digital-ator.Dockerfile
index fab0739..b045908 100644
--- a/stacks/digital-ator.Dockerfile
+++ b/stacks/digital-ator.Dockerfile
@@ -1,6 +1,6 @@
 # OSIC Stacks - analog-xk-arch
 # Dev enviroment for analog circuits development using xschem and klayout.
-ARG BASE_IMG=osicstacks-base-native
+ARG BASE_IMG=osicstacks-base-desktop
 FROM $BASE_IMG as digital-ator
 
 # Update packages