diff --git a/download_rhel_iso/download_rhel_iso.py b/download_rhel_iso/download_rhel_iso.py
index 61c9acaa70322363147c06c8ddae9a982ce14f3e..2ac1048018c7ba350df78577476ae4c8a90934a7 100755
--- a/download_rhel_iso/download_rhel_iso.py
+++ b/download_rhel_iso/download_rhel_iso.py
@@ -36,7 +36,7 @@ def main():
 		body = "ERROR: Offline_token variable needs to be passed, exiting."
 		send_email(ADMIN_EMAIL, subject, body)
 		print(body)
-		sys.exit(1)
+		sys.exit(0)
 
 	## Authorization (generate an access token from the 'offline_token')
 	url = 'https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token'
@@ -47,7 +47,7 @@ def main():
 		body = "ERROR: Unable to auth, exiting"
 		send_email(ADMIN_EMAIL, subject, body)
 		print(body)
-		sys.exit(1)
+		sys.exit(0)
 	token = json.loads(result.content)['access_token']
 
     ## Getting list of available ISOs according to cset
@@ -64,7 +64,7 @@ def main():
 			print(body)
 			if len(success_isos) != 0:
 				success_email(success_isos)
-			sys.exit(1)
+			sys.exit(0)
 		content = json.loads(result.content)
 
 		items_of_interest = []
@@ -90,10 +90,10 @@ def main():
 						iso_status = download_iso(token, item, arch_rel_dir)
 						if not iso_status[0]:
 							if len(success_isos) == 0:
-								sys.exit(1)
+								sys.exit(0)
 							else:
 								success_email(success_isos)
-								sys.exit(1)
+								sys.exit(0)
 						else:
 							if extract_iso(iso_status[1], arch_rel_dir):
 								if arch == "x86_64" or arch == "aarch64":
@@ -103,20 +103,20 @@ def main():
 								success_isos.append(item)
 							else:
 								if len(success_isos) == 0:
-									sys.exit(1)
+									sys.exit(0)
 								else:
 									success_email(success_isos)
-									sys.exit(1)
+									sys.exit(0)
 
 				else:
 					arch_rel_dir = os.path.join(minor_rel_dir, arch)
 					iso_status = download_iso(token, item, arch_rel_dir)
 					if not iso_status[0]:
 						if len(success_isos) == 0:
-							sys.exit(1)
+							sys.exit(0)
 						else:
 							success_email(success_isos)
-							sys.exit(1)
+							sys.exit(0)
 					else:
 						if extract_iso(iso_status[1], arch_rel_dir):
 							if arch == "x86_64" or arch == "aarch64":
@@ -126,19 +126,19 @@ def main():
 							success_isos.append(item)
 						else:
 							if len(success_isos) == 0:
-								sys.exit(1)
+								sys.exit(0)
 							else:
 								success_email(success_isos)
-								sys.exit(1)
+								sys.exit(0)
 			else:
 				arch_rel_dir = os.path.join(major_rel_dir, item_release, arch)
 				iso_status = download_iso(token, item, arch_rel_dir)
 				if not iso_status[0]:
 					if len(success_isos) == 0:
-						sys.exit(1)
+						sys.exit(0)
 					else:
 						success_email(success_isos)
-						sys.exit(1)
+						sys.exit(0)
 				else:
 					if extract_iso(iso_status[1], arch_rel_dir):
 						if arch == "x86_64" or arch == "aarch64":
@@ -148,10 +148,10 @@ def main():
 						success_isos.append(item)
 					else:
 						if len(success_isos) == 0:
-							sys.exit(1)
+							sys.exit(0)
 						else:
 							success_email(success_isos)
-							sys.exit(1)
+							sys.exit(0)		
 
 	if len(success_isos) == 0:
 		dt = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -305,6 +305,7 @@ def extract_iso(iso_fp, extract_dir):
 				break
 	
 	if re.findall("\d+\.\d+", filename)[0].split(".")[0] != "8" or "dvd" not in filename:
+		print("Not 8 or dvd not in filename.")
 		verify = True
 
 	if verify:
@@ -418,16 +419,22 @@ def rhel_iso_to_aims(iso_dict):
 
 	pxe_path = os.path.join("/rhel", major, item_release, arch, "images/pxeboot")
 
-	result = subprocess.run(["/root/rheliso_to_aims.sh", name, arch, description, pxe_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+	nomad_task = os.getenv('NOMAD_TASK_NAME')
+	project_status = nomad_task.split("_")[0]
+	if project_status == "prod":
+		aims_dest = ""
+	else:
+		aims_dest = "--testserver"
+
+	result = subprocess.run(["/root/rheliso_to_aims.sh", name, arch, description, pxe_path, aims_dest], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
 	if result.returncode == 0:
 		print("%s added in AIMS as %s" % (iso_dict['filename'], name))
-		print(result.stdout)
 	else:		
 		subject = "Shell script to AIMS error"
 		body = "ERROR: rheliso_to_aims.sh did NOT run succesfully due to:\n%s" % result.stderr
 		send_email(ADMIN_EMAIL, subject, body)
 		print(body)
-		sys.exit(1)
+		sys.exit(0)
 
 
 
diff --git a/download_rhel_iso/rheliso_to_aims.sh b/download_rhel_iso/rheliso_to_aims.sh
index d319b2cad26449e6f4503436e59aec1f11d3da8e..9786db453d1bb922b8f69c7d4b066f14df58ff74 100755
--- a/download_rhel_iso/rheliso_to_aims.sh
+++ b/download_rhel_iso/rheliso_to_aims.sh
@@ -4,10 +4,11 @@ NAME=$1
 ARCH=$2
 DESC=$3
 PXE_PATH=$4
+AIMS_DEST=$5
 
 echo $LINUXCI_PWD | kinit $LINUXCI_USER
 
-/usr/bin/aims2client --testserver addimg \
+/usr/bin/aims2client ${AIMS_DEST} addimg \
     --name "${NAME}" \
     --arch "${ARCH}" \
     --description "${DESC}" \
@@ -17,14 +18,3 @@ echo $LINUXCI_PWD | kinit $LINUXCI_USER
     --noprogress \
     --force \
     --uefi
-
-/usr/bin/aims2client addimg \
-    --name "${NAME}" \
-    --arch "${ARCH}" \
-    --description "${DESC}" \
-    --vmlinuz "${PXE_PATH}/vmlinuz" \
-    --initrd "${PXE_PATH}/initrd.img" \
-    --egroup "${ADMIN_EMAIL}" \
-    --noprogress \
-    --force \
-    --uefi
\ No newline at end of file