diff --git a/.github/workflows/secure-rebuild.yml b/.github/workflows/secure-rebuild.yml
index 4dc8e15..faf1fe1 100644
--- a/.github/workflows/secure-rebuild.yml
+++ b/.github/workflows/secure-rebuild.yml
@@ -245,7 +245,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          SOURCE_IMAGE="${COMPANY_NAME}/4testing-${PRODUCT_NAME}${EDITION}:${SOURCE_TAG}"
+          SOURCE_IMAGE="${COMPANY_NAME}/base-${PRODUCT_NAME}${EDITION}:${SOURCE_TAG}"
           PATCHED_IMAGE="${COMPANY_NAME}/4testing-${PRODUCT_NAME}${EDITION}:${SOURCE_TAG}-secure"
 
           echo "Source image: ${SOURCE_IMAGE}"
diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml
index 1e3bab3..48bb927 100644
--- a/.github/workflows/stable-build.yml
+++ b/.github/workflows/stable-build.yml
@@ -106,6 +106,11 @@ jobs:
             if [ "${LATEST}" = "true" ]; then
               PUSH_TAGS+=( "-t" "$RELEASE_IMAGE:latest" )
             fi
+
+            # Save base images for use them on rebuild
+            if [ "${PRODUCT_EDITION}" == "-de" ] || [ "${PRODUCT_EDITION}" == "-ee" ]; then
+                PUSH_TAGS+=( "-t" "${COMPANY_NAME}/base-${PRODUCT_NAME}${PRODUCT_EDITION}:${VERSION}" )
+            fi
             docker buildx imagetools create "${PUSH_TAGS[@]}" "${SOURCE_IMAGE}"
         shell: bash