diff --git a/ui/admin/app/components/form/storage-bucket/index.hbs b/ui/admin/app/components/form/storage-bucket/index.hbs
index 47e075b61..7a44ba0c4 100644
--- a/ui/admin/app/components/form/storage-bucket/index.hbs
+++ b/ui/admin/app/components/form/storage-bucket/index.hbs
@@ -217,60 +217,7 @@
       {{/if}}
     </Form::Field::SecretInput>
   {{/if}}
-  {{#if @model.isNew}}
-    <Hds::Form::TextInput::Field
-      @isRequired={{true}}
-      @value={{@model.access_key_id}}
-      @isInvalid={{@model.errors.access_key_id}}
-      @type='text'
-      name='access_key_id'
-      disabled={{form.disabled}}
-      {{on 'input' (set-from-event @model 'access_key_id')}}
-      as |F|
-    >
-      <F.Label>{{t
-          'resources.storage-bucket.form.access_key_id.label'
-        }}</F.Label>
-      <F.HelperText>{{t
-          'resources.storage-bucket.form.access_key_id.help'
-        }}</F.HelperText>
-      {{#if @model.errors.access_key_id}}
-        <F.Error as |E|>
-          {{#each @model.errors.access_key_id as |error|}}
-            <E.Message>{{error.message}}</E.Message>
-          {{/each}}
-        </F.Error>
-      {{/if}}
-    </Hds::Form::TextInput::Field>
 
-  {{else}}
-    <Form::Field::SecretInput
-      @isRequired={{true}}
-      @isInvalid={{@model.errors.access_key_id}}
-      @type='text'
-      @name='access_key_id'
-      @disabled={{form.disabled}}
-      @showEditButton={{true}}
-      @accessKeyId={{@model.access_key_id}}
-      {{on 'input' (set-from-event @model 'access_key_id')}}
-      as |F|
-    >
-      <F.Label>{{t
-          'resources.storage-bucket.form.access_key_id.label'
-        }}</F.Label>
-      <F.HelperText>{{t
-          'resources.storage-bucket.form.access_key_id.help'
-        }}</F.HelperText>
-      {{#if @model.errors.access_key_id}}
-        <F.Error as |E|>
-          {{#each @model.errors.access_key_id as |error|}}
-            <E.Message>{{error.message}}</E.Message>
-          {{/each}}
-        </F.Error>
-      {{/if}}
-    </Form::Field::SecretInput>
-
-  {{/if}}
   <Hds::Form::TextInput::Field
     @isRequired={{true}}
     @value={{@model.secret_access_key}}
diff --git a/ui/admin/app/components/form/storage-bucket/index.js b/ui/admin/app/components/form/storage-bucket/index.js
index c416707c4..8ffada749 100644
--- a/ui/admin/app/components/form/storage-bucket/index.js
+++ b/ui/admin/app/components/form/storage-bucket/index.js
@@ -20,7 +20,6 @@ export default class FormStorageBucketComponent extends Component {
 
   /**
    * Call passed cancel function.
-   * Unset updated secrets
    */
   @action
   cancel() {
diff --git a/ui/admin/app/components/form/target/details/index.hbs b/ui/admin/app/components/form/target/details/index.hbs
index eaabdad4b..5b7f672ff 100644
--- a/ui/admin/app/components/form/target/details/index.hbs
+++ b/ui/admin/app/components/form/target/details/index.hbs
@@ -50,30 +50,7 @@
       </F.Error>
     {{/if}}
   </Hds::Form::Textarea::Field>
-  <Form::Field::SecretInput
-    @isRequired={{true}}
-    @isInvalid={{@model.errors.access_key_id}}
-    @value={{@model.access_key_id}}
-    @type='text'
-    @name='access_key_id'
-    @disabled={{form.disabled}}
-    @showEditButton={{true}}
-    @cancel={{this.cancel}}
-    {{on 'input' (set-from-event @model 'access_key_id')}}
-    as |F|
-  >
-    <F.Label>{{t 'resources.storage-bucket.form.access_key_id.label'}}</F.Label>
-    <F.HelperText>{{t
-        'resources.storage-bucket.form.access_key_id.help'
-      }}</F.HelperText>
-    {{#if @model.errors.access_key_id}}
-      <F.Error as |E|>
-        {{#each @model.errors.access_key_id as |error|}}
-          <E.Message>{{error.message}}</E.Message>
-        {{/each}}
-      </F.Error>
-    {{/if}}
-  </Form::Field::SecretInput>
+
   {{#if (and @model.isNew (feature-flag 'ssh-target'))}}
     <Hds::Form::RadioCard::Group @name='type' @alignment='center' as |G|>
       <G.Legend>{{t 'resources.target.form.type.label'}}</G.Legend>
@@ -107,6 +84,31 @@
     </InfoField>
   {{/if}}
 
+  {{#if (feature-flag 'target-network-address')}}
+    <Hds::Form::TextInput::Field
+      @isOptional={{true}}
+      @value={{@model.address}}
+      @isInvalid={{@model.errors.address}}
+      @type='text'
+      name='address'
+      disabled={{form.disabled}}
+      {{on 'input' (set-from-event @model 'address')}}
+      as |F|
+    >
+      <F.Label>{{t 'resources.target.form.target-address.label'}}</F.Label>
+      <F.HelperText>{{t
+          'resources.target.form.target-address.help'
+        }}</F.HelperText>
+      {{#if @model.errors.address}}
+        <F.Error as |E|>
+          {{#each @model.errors.address as |error|}}
+            <E.Message>{{error.message}}</E.Message>
+          {{/each}}
+        </F.Error>
+      {{/if}}
+    </Hds::Form::TextInput::Field>
+  {{/if}}
+
   <Hds::Form::TextInput::Field
     @isRequired={{@model.isTCP}}
     @isOptional={{not @model.isTCP}}