diff --git a/.github/workflows/build-push-all.yml b/.github/workflows/build-push-all.yml
index 763a478..017cb21 100644
--- a/.github/workflows/build-push-all.yml
+++ b/.github/workflows/build-push-all.yml
@@ -12,6 +12,7 @@ jobs:
     uses: ./.github/workflows/build-push.yml
     with:
       containerfile: ./Containerfile.workstation
+      from_tag: ${{ inputs.release_version }}
       release_version: ${{ inputs.release_version }}
       tag_suffix: -${{ github.ref_name }}
     secrets:
@@ -21,7 +22,8 @@ jobs:
     needs: build-push-base-image
     with:
       containerfile: ./Containerfile.nvidia
-      release_version: ${{ inputs.release_version }}-${{ github.ref_name }}
+      from_tag: ${{ inputs.release_version }}-${{ github.ref_name }}
+      release_version: ${{ inputs.release_version }}
       tag_suffix: -nvidia
     secrets:
       actions_token: ${{ secrets.actions_token }}
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index ee11ab6..83cf2f1 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -4,6 +4,9 @@ on:
       containerfile:
         required: true
         type: string
+      from_tag:
+        required: true
+        type: string
       release_version:
         required: true
         type: string
@@ -36,6 +39,7 @@ jobs:
           containerfiles: ${{ inputs.containerfile }}
           build-args: |
             release=${{ inputs.release_version }}
+            tag=${{ inputs.from_tag }}
       - name: push image
         id: push-base-image
         uses: redhat-actions/push-to-registry@v2
diff --git a/Containerfile.nvidia b/Containerfile.nvidia
index fdce043..97809d8 100644
--- a/Containerfile.nvidia
+++ b/Containerfile.nvidia
@@ -1,7 +1,8 @@
-ARG variant=silverblue
 ARG release=38
+ARG tag=38-main
+ARG variant=silverblue
 
-FROM ghcr.io/jmpolom/fedora-$variant-ws:$release as kmod-build
+FROM ghcr.io/jmpolom/fedora-$variant-ws:$tag as kmod-build
 ARG release
 RUN rpm -q kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}' > /kernel-version.txt && \
     rpm-ostree install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$release.noarch.rpm \
diff --git a/Containerfile.workstation b/Containerfile.workstation
index d13866f..12bf0e3 100644
--- a/Containerfile.workstation
+++ b/Containerfile.workstation
@@ -1,7 +1,8 @@
-ARG variant=silverblue
 ARG release=38
+ARG tag=38
+ARG variant=silverblue
 
-FROM quay.io/fedora-ostree-desktops/$variant:$release
+FROM quay.io/fedora-ostree-desktops/$variant:$tag
 COPY etc/containers/ /etc/containers/
 COPY usr/bin/ /usr/bin/
 RUN rpm-ostree install \