diff --git a/cmd/osbuild-worker/main.go b/cmd/osbuild-worker/main.go
index 8aac5d95b..ff5b1146d 100644
--- a/cmd/osbuild-worker/main.go
+++ b/cmd/osbuild-worker/main.go
@@ -133,12 +133,7 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
 
 	end_time := time.Now()
 
-	// Don't run uploaders if osbuild failed
-	if !result.Success {
-		return result, nil
-	}
-
-	if args.ImageName != "" {
+	if result.Success && args.ImageName != "" {
 		var f *os.File
 		imagePath := path.Join(outputDirectory, args.ImageName)
 		if args.StreamOptimized {
@@ -163,6 +158,9 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
 	for _, t := range args.Targets {
 		switch options := t.Options.(type) {
 		case *target.LocalTargetOptions:
+			if !result.Success {
+				continue
+			}
 			var f *os.File
 			imagePath := path.Join(outputDirectory, options.Filename)
 			if options.StreamOptimized {
@@ -186,7 +184,9 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
 			}
 
 		case *target.AWSTargetOptions:
-
+			if !result.Success {
+				continue
+			}
 			a, err := awsupload.New(options.Region, options.AccessKeyID, options.SecretAccessKey)
 			if err != nil {
 				r = append(r, err)
@@ -211,7 +211,9 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
 				continue
 			}
 		case *target.AzureTargetOptions:
-
+			if !result.Success {
+				continue
+			}
 			credentials := azure.Credentials{
 				StorageAccount:   options.StorageAccount,
 				StorageAccessKey: options.StorageAccessKey,
@@ -261,6 +263,14 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
 				}
 			}()
 
+			if result.Success == false {
+				err = k.CGFailBuild(int(options.BuildID), options.Token)
+				if err != nil {
+					log.Printf("CGFailBuild failed: %v", err)
+				}
+				continue
+			}
+
 			f, err := os.Open(path.Join(outputDirectory, options.Filename))
 			if err != nil {
 				r = append(r, err)
@@ -342,51 +352,6 @@ func RunJob(job worker.Job, store string, kojiServers map[string]koji.GSSAPICred
 	return result, nil
 }
 
-func FailJob(job worker.Job, kojiServers map[string]koji.GSSAPICredentials) {
-	args, err := job.OSBuildArgs()
-	if err != nil {
-		panic(err)
-	}
-
-	for _, t := range args.Targets {
-		switch options := t.Options.(type) {
-		case *target.KojiTargetOptions:
-			// Koji for some reason needs TLS renegotiation enabled.
-			// Clone the default http transport and enable renegotiation.
-			transport := http.DefaultTransport.(*http.Transport).Clone()
-			transport.TLSClientConfig = &tls.Config{
-				Renegotiation: tls.RenegotiateOnceAsClient,
-			}
-
-			kojiServer, _ := url.Parse(options.Server)
-			creds, exists := kojiServers[kojiServer.Hostname()]
-			if !exists {
-				log.Printf("Koji server has not been configured: %s", kojiServer.Hostname())
-				return
-			}
-
-			k, err := koji.NewFromGSSAPI(options.Server, &creds, transport)
-			if err != nil {
-				log.Printf("koji login failed: %v", err)
-				return
-			}
-
-			defer func() {
-				err := k.Logout()
-				if err != nil {
-					log.Printf("koji logout failed: %v", err)
-				}
-			}()
-
-			err = k.CGFailBuild(int(options.BuildID), options.Token)
-			if err != nil {
-				log.Printf("CGFailBuild failed: %v", err)
-			}
-		default:
-		}
-	}
-}
-
 // Regularly ask osbuild-composer if the compose we're currently working on was
 // canceled and exit the process if it was.
 // It would be cleaner to kill the osbuild process using (`exec.CommandContext`
@@ -501,9 +466,6 @@ func main() {
 		if err != nil || result.Success == false {
 			log.Printf("  Job failed: %v", err)
 
-			// Fail the jobs in any targets that expects it
-			FailJob(job, kojiServers)
-
 			// Ensure we always have a non-nil result, composer doesn't like nils.
 			// This can happen in cases when OSBuild crashes and doesn't produce
 			// a meaningful output. E.g. when the machine runs of disk space.