diff --git a/firestarter/tests/test_build_images_functionality.py b/firestarter/tests/test_build_images_functionality.py
index 45c9a281..f11ad45d 100644
--- a/firestarter/tests/test_build_images_functionality.py
+++ b/firestarter/tests/test_build_images_functionality.py
@@ -94,22 +94,22 @@ def execute_function_test(mocker, flavors, **kwargs) -> None:
         assert len(compile_images_for_all_flavors_mock.mock_calls) == kwargs["compile_image_calls"]
 
     execute_function_test(
-        mocker, "*", checkout_calls=1, login_calls=5, compile_image_calls=1
+        mocker, "*", checkout_calls=1, login_calls=6, compile_image_calls=1
     )
     execute_function_test(
-        mocker, "flavor1, flavor3", checkout_calls=1, login_calls=5, compile_image_calls=1
+        mocker, "flavor1, flavor3", checkout_calls=1, login_calls=6, compile_image_calls=1
     )
     execute_function_test(
-        mocker, "flavor2, flavor3", checkout_calls=1, login_calls=3, compile_image_calls=1
+        mocker, "flavor2, flavor3", checkout_calls=1, login_calls=4, compile_image_calls=1
     )
     execute_function_test(
-        mocker, "flavor0, flavor4", checkout_calls=1, login_calls=1, compile_image_calls=1
+        mocker, "flavor0, flavor4", checkout_calls=1, login_calls=2, compile_image_calls=1
     )
     execute_function_test(
-        mocker, "flavor1", checkout_calls=1, login_calls=3, compile_image_calls=1
+        mocker, "flavor1", checkout_calls=1, login_calls=4, compile_image_calls=1
     )
     execute_function_test(
-        mocker, "", checkout_calls=1, login_calls=3, compile_image_calls=1
+        mocker, "", checkout_calls=1, login_calls=4, compile_image_calls=1
     )
 
 
diff --git a/firestarter/workflows/build_images/build_images.py b/firestarter/workflows/build_images/build_images.py
index 554e42bd..a137ae2f 100644
--- a/firestarter/workflows/build_images/build_images.py
+++ b/firestarter/workflows/build_images/build_images.py
@@ -172,9 +172,15 @@ def execute(self):
         if self.login_required:
             self.login(
                 self.auth_strategy,
-                default_registry,
-                default_registry_creds,
+                self.snapshots_registry,
+                self.snapshots_registry_creds,
             )
+            if self.releases_registry != self.snapshots_registry:
+                self.login(
+                    self.auth_strategy,
+                    self.releases_registry,
+                    self.releases_registry_creds,
+                )
 
         for flavor in self.flavors:
             logger.info(f"Building flavor {flavor}...")