diff --git a/src/views/credentials/__tests__/__snapshots__/addCredentialModal.test.tsx.snap b/src/views/credentials/__tests__/__snapshots__/addCredentialModal.test.tsx.snap
index 51f22d40..9f958521 100644
--- a/src/views/credentials/__tests__/__snapshots__/addCredentialModal.test.tsx.snap
+++ b/src/views/credentials/__tests__/__snapshots__/addCredentialModal.test.tsx.snap
@@ -155,6 +155,8 @@ exports[`CredentialFormFields should render a basic component: basic 1`] = `
         type="password"
       />
     </FormGroup>
+  </React.Fragment>
+  <React.Fragment>
     <FormGroup
       fieldId="become_method"
       label="Become Method"
@@ -207,6 +209,102 @@ exports[`CredentialFormFields should render a basic component: basic 1`] = `
 </React.Fragment>
 `;
 
+exports[`CredentialFormFields should render ansible form appropriately: ansible, "Username and Password" 1`] = `
+<React.Fragment>
+  <FormGroup
+    fieldId="name"
+    isRequired={true}
+    label="Name"
+  >
+    <TextInput
+      id="credential-name"
+      isRequired={true}
+      name="name"
+      onChange={[Function]}
+      placeholder="Enter a name for the credential"
+      type="text"
+    />
+  </FormGroup>
+  <React.Fragment>
+    <FormGroup
+      fieldId="username"
+      isRequired={true}
+      label="Username"
+    >
+      <TextInput
+        id="credential-username"
+        isRequired={true}
+        name="username"
+        onChange={[Function]}
+        placeholder="Enter username"
+      />
+    </FormGroup>
+    <FormGroup
+      fieldId="password"
+      isRequired={true}
+      label="Password"
+    >
+      <TextInput
+        id="credential-password"
+        isRequired={true}
+        name="password"
+        onChange={[Function]}
+        placeholder="Enter password"
+        type="password"
+      />
+    </FormGroup>
+  </React.Fragment>
+</React.Fragment>
+`;
+
+exports[`CredentialFormFields should render satellite form appropriately: satellite, "Username and Password" 1`] = `
+<React.Fragment>
+  <FormGroup
+    fieldId="name"
+    isRequired={true}
+    label="Name"
+  >
+    <TextInput
+      id="credential-name"
+      isRequired={true}
+      name="name"
+      onChange={[Function]}
+      placeholder="Enter a name for the credential"
+      type="text"
+    />
+  </FormGroup>
+  <React.Fragment>
+    <FormGroup
+      fieldId="username"
+      isRequired={true}
+      label="Username"
+    >
+      <TextInput
+        id="credential-username"
+        isRequired={true}
+        name="username"
+        onChange={[Function]}
+        placeholder="Enter username"
+      />
+    </FormGroup>
+    <FormGroup
+      fieldId="password"
+      isRequired={true}
+      label="Password"
+    >
+      <TextInput
+        id="credential-password"
+        isRequired={true}
+        name="password"
+        onChange={[Function]}
+        placeholder="Enter password"
+        type="password"
+      />
+    </FormGroup>
+  </React.Fragment>
+</React.Fragment>
+`;
+
 exports[`CredentialFormFields should render specific to authType for type network: network, SSH Key 1`] = `
 <React.Fragment>
   <FormGroup
@@ -284,6 +382,56 @@ exports[`CredentialFormFields should render specific to authType for type networ
       />
     </FormGroup>
   </React.Fragment>
+  <React.Fragment>
+    <FormGroup
+      fieldId="become_method"
+      label="Become Method"
+    >
+      <SimpleDropdown
+        dropdownItems={
+          [
+            "Select option",
+            "sudo",
+            "su",
+            "pbrun",
+            "pfexec",
+            "doas",
+            "dzdo",
+            "ksu",
+            "runas",
+          ]
+        }
+        isFullWidth={true}
+        label="Select option"
+        onSelect={[Function]}
+        variant="default"
+      />
+    </FormGroup>
+    <FormGroup
+      fieldId="become_user"
+      label="Become User"
+    >
+      <TextInput
+        id="become_user"
+        name="become_user"
+        onChange={[Function]}
+        placeholder="Enter become user (optional)"
+        type="text"
+      />
+    </FormGroup>
+    <FormGroup
+      fieldId="become_password"
+      label="Become Password"
+    >
+      <TextInput
+        id="become_password"
+        name="become_password"
+        onChange={[Function]}
+        placeholder="Enter become password (optional)"
+        type="password"
+      />
+    </FormGroup>
+  </React.Fragment>
 </React.Fragment>
 `;
 
@@ -348,6 +496,8 @@ exports[`CredentialFormFields should render specific to authType for type networ
         type="password"
       />
     </FormGroup>
+  </React.Fragment>
+  <React.Fragment>
     <FormGroup
       fieldId="become_method"
       label="Become Method"
@@ -511,51 +661,51 @@ exports[`CredentialFormFields should render specific to authType for type opensh
         type="password"
       />
     </FormGroup>
+  </React.Fragment>
+</React.Fragment>
+`;
+
+exports[`CredentialFormFields should render vcenter form appropriately: vcenter, "Username and Password" 1`] = `
+<React.Fragment>
+  <FormGroup
+    fieldId="name"
+    isRequired={true}
+    label="Name"
+  >
+    <TextInput
+      id="credential-name"
+      isRequired={true}
+      name="name"
+      onChange={[Function]}
+      placeholder="Enter a name for the credential"
+      type="text"
+    />
+  </FormGroup>
+  <React.Fragment>
     <FormGroup
-      fieldId="become_method"
-      label="Become Method"
-    >
-      <SimpleDropdown
-        dropdownItems={
-          [
-            "Select option",
-            "sudo",
-            "su",
-            "pbrun",
-            "pfexec",
-            "doas",
-            "dzdo",
-            "ksu",
-            "runas",
-          ]
-        }
-        isFullWidth={true}
-        label="Select option"
-        onSelect={[Function]}
-        variant="default"
-      />
-    </FormGroup>
-    <FormGroup
-      fieldId="become_user"
-      label="Become User"
+      fieldId="username"
+      isRequired={true}
+      label="Username"
     >
       <TextInput
-        id="become_user"
-        name="become_user"
+        id="credential-username"
+        isRequired={true}
+        name="username"
         onChange={[Function]}
-        placeholder="Enter become user (optional)"
-        type="text"
+        placeholder="Enter username"
       />
     </FormGroup>
     <FormGroup
-      fieldId="become_password"
-      label="Become Password"
+      fieldId="password"
+      isRequired={true}
+      label="Password"
     >
       <TextInput
-        id="become_password"
-        name="become_password"
+        id="credential-password"
+        isRequired={true}
+        name="password"
         onChange={[Function]}
-        placeholder="Enter become password (optional)"
+        placeholder="Enter password"
         type="password"
       />
     </FormGroup>
diff --git a/src/views/credentials/__tests__/addCredentialModal.test.tsx b/src/views/credentials/__tests__/addCredentialModal.test.tsx
index eb0f2128..d2522c5b 100644
--- a/src/views/credentials/__tests__/addCredentialModal.test.tsx
+++ b/src/views/credentials/__tests__/addCredentialModal.test.tsx
@@ -106,6 +106,21 @@ describe('CredentialFormFields', () => {
     expect(openshiftToken).toMatchSnapshot('openshift, "Token"');
   });
 
+  it('should render vcenter form appropriately', async () => {
+    const vcenter = await shallowComponent(<CredentialFormFields typeValue="vcenter" />);
+    expect(vcenter).toMatchSnapshot('vcenter, "Username and Password"');
+  });
+
+  it('should render satellite form appropriately', async () => {
+    const satellite = await shallowComponent(<CredentialFormFields typeValue="satellite" />);
+    expect(satellite).toMatchSnapshot('satellite, "Username and Password"');
+  });
+
+  it('should render ansible form appropriately', async () => {
+    const ansible = await shallowComponent(<CredentialFormFields typeValue="ansible" />);
+    expect(ansible).toMatchSnapshot('ansible, "Username and Password"');
+  });
+
   it('should call handlers for setAuthType and handleInputChange', async () => {
     const mockHandleInputChange = jest.fn();
     const mockSetAuthType = jest.fn();
diff --git a/src/views/credentials/addCredentialModal.tsx b/src/views/credentials/addCredentialModal.tsx
index 3b291d8e..c77171d7 100644
--- a/src/views/credentials/addCredentialModal.tsx
+++ b/src/views/credentials/addCredentialModal.tsx
@@ -170,35 +170,6 @@ const CredentialFormFields: React.FC<CredentialFormFieldsProps> = ({
             onChange={event => handleInputChange('password', (event.target as HTMLInputElement).value)}
           />
         </FormGroup>
-        <FormGroup label="Become Method" fieldId="become_method">
-          <SimpleDropdown
-            label={formData?.become_method || 'Select option'}
-            variant="default"
-            isFullWidth
-            onSelect={item => handleInputChange('become_method', (item !== 'Select option' && item) || '')}
-            dropdownItems={['Select option', 'sudo', 'su', 'pbrun', 'pfexec', 'doas', 'dzdo', 'ksu', 'runas']}
-          />
-        </FormGroup>
-        <FormGroup label="Become User" fieldId="become_user">
-          <TextInput
-            value={formData?.become_user}
-            placeholder="Enter become user (optional)"
-            type="text"
-            id="become_user"
-            name="become_user"
-            onChange={event => handleInputChange('become_user', (event.target as HTMLInputElement).value)}
-          />
-        </FormGroup>
-        <FormGroup label="Become Password" fieldId="become_password">
-          <TextInput
-            value={formData?.become_password}
-            placeholder="Enter become password (optional)"
-            type="password"
-            id="become_password"
-            name="become_password"
-            onChange={event => handleInputChange('become_password', (event.target as HTMLInputElement).value)}
-          />
-        </FormGroup>
       </React.Fragment>
     )}
 
@@ -241,9 +212,43 @@ const CredentialFormFields: React.FC<CredentialFormFieldsProps> = ({
         </FormGroup>
       </React.Fragment>
     )}
+
+    {/* Render "Become" fields only if network is selected and authType is Username/Password or SSH Key */}
+    {typeValue === 'network' && (
+      <React.Fragment>
+        <FormGroup label="Become Method" fieldId="become_method">
+          <SimpleDropdown
+            label={formData?.become_method || 'Select option'}
+            variant="default"
+            isFullWidth
+            onSelect={item => handleInputChange('become_method', (item !== 'Select option' && item) || '')}
+            dropdownItems={['Select option', 'sudo', 'su', 'pbrun', 'pfexec', 'doas', 'dzdo', 'ksu', 'runas']}
+          />
+        </FormGroup>
+        <FormGroup label="Become User" fieldId="become_user">
+          <TextInput
+            value={formData?.become_user}
+            placeholder="Enter become user (optional)"
+            type="text"
+            id="become_user"
+            name="become_user"
+            onChange={event => handleInputChange('become_user', (event.target as HTMLInputElement).value)}
+          />
+        </FormGroup>
+        <FormGroup label="Become Password" fieldId="become_password">
+          <TextInput
+            value={formData?.become_password}
+            placeholder="Enter become password (optional)"
+            type="password"
+            id="become_password"
+            name="become_password"
+            onChange={event => handleInputChange('become_password', (event.target as HTMLInputElement).value)}
+          />
+        </FormGroup>
+      </React.Fragment>
+    )}
   </React.Fragment>
 );
-
 const AddCredentialModal: React.FC<AddCredentialModalProps> = ({
   isOpen,
   credential,