diff --git a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx
index fc3986a75..2408a14b1 100644
--- a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx
+++ b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx
@@ -76,6 +76,10 @@ function CreateView() {
                   Edge Groups
                 </Link>{' '}
                 page to assign environments and create groups.
+                <br />
+                You can upgrade from any agent version to 2.17 or later only.
+                You can not upgrade to an agent version prior to 2.17 . The
+                ability to rollback to originating version is for 2.15.0+ only.
               </TextTip>
 
               <Formik
@@ -96,13 +100,6 @@ function CreateView() {
                       error={errors.groupIds}
                     />
 
-                    <TextTip color="blue">
-                      You can upgrade from any agent version to 2.17 or later
-                      only. You can not upgrade to an agent version prior to
-                      2.17 . The ability to rollback to originating version is
-                      for 2.15.0+ only.
-                    </TextTip>
-
                     <div className="mt-2">
                       <ScheduleTypeSelector />
                     </div>
diff --git a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx
index 99b93c44e..90c83f6d4 100644
--- a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx
+++ b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx
@@ -91,7 +91,7 @@ function ItemView() {
           <Widget>
             <Widget.Title title="Update & Rollback Scheduler" icon={Settings} />
             <Widget.Body>
-              <TextTip color="blue">
+              <TextTip color="blue" className="mb-2">
                 Devices need to be allocated to an Edge group, visit the{' '}
                 <Link
                   to="edge.groups"
@@ -100,6 +100,10 @@ function ItemView() {
                   Edge Groups
                 </Link>{' '}
                 page to assign environments and create groups.
+                <br />
+                You can upgrade from any agent version to 2.17 or later only.
+                You can not upgrade to an agent version prior to 2.17 . The
+                ability to rollback to originating version is for 2.15.0+ only.
               </TextTip>
 
               <Formik
diff --git a/app/react/portainer/environments/update-schedules/common/validation.ts b/app/react/portainer/environments/update-schedules/common/validation.ts
index 0186dc29c..67e0b9933 100644
--- a/app/react/portainer/environments/update-schedules/common/validation.ts
+++ b/app/react/portainer/environments/update-schedules/common/validation.ts
@@ -44,5 +44,19 @@ export function validation(
         otherwise: (schema) => schema.required('No rollback options available'),
       }),
     registryId: number().default(0),
+    agentImage: string()
+      .default('')
+      .when('registryId', {
+        is: 0,
+        then: (schema) => schema.optional(),
+        otherwise: (schema) => schema.required('Agent image is required'),
+      }),
+    updaterImage: string()
+      .default('')
+      .when('registryId', {
+        is: 0,
+        then: (schema) => schema.optional(),
+        otherwise: (schema) => schema.required('Updater image is required'),
+      }),
   });
 }
diff --git a/app/react/portainer/registries/queries/useRegistries.ts b/app/react/portainer/registries/queries/useRegistries.ts
index 1f1e9eba0..007ab70cb 100644
--- a/app/react/portainer/registries/queries/useRegistries.ts
+++ b/app/react/portainer/registries/queries/useRegistries.ts
@@ -78,7 +78,6 @@ export function useGenericRegistriesQuery<T = Registry[]>(
 export async function getRegistries() {
   try {
     const { data } = await axios.get<Registry[]>('/registries');
-
     return data;
   } catch (e) {
     throw parseAxiosError(e as Error, 'Unable to retrieve registries');