diff --git a/addons/api/addon/generated/models/target.js b/addons/api/addon/generated/models/target.js
index 38b831966..55c83d18c 100644
--- a/addons/api/addon/generated/models/target.js
+++ b/addons/api/addon/generated/models/target.js
@@ -22,6 +22,18 @@ export default class GeneratedTargetModel extends BaseModel {
   })
   description;
 
+  @attr('number', {
+    description: '',
+    defaultValue: 28800
+  })
+  session_max_seconds;
+
+  @attr('number', {
+    description: '',
+    defaultValue: 1
+  })
+  session_connection_limit;
+
   @attr('date', {
     description: 'The time this resource was created\nOutput only.',
     readOnly: true,
diff --git a/addons/api/tests/unit/serializers/target-test.js b/addons/api/tests/unit/serializers/target-test.js
index 07d5b3c21..d8e4a58fb 100644
--- a/addons/api/tests/unit/serializers/target-test.js
+++ b/addons/api/tests/unit/serializers/target-test.js
@@ -20,7 +20,7 @@ module('Unit | Serializer | target', function (hooks) {
         type: 'org',
       },
       version: 1,
-      type: 'tcp',
+      type: 'tcp'
     });
     const snapshot = record._createSnapshot();
     snapshot.adapterOptions = {};
@@ -31,6 +31,8 @@ module('Unit | Serializer | target', function (hooks) {
       version: 1,
       type: 'tcp',
       scope_id: 'org_1',
+      session_max_seconds: 28800,
+      session_connection_limit: 1,
       attributes: {
         default_port: null,
       },
diff --git a/ui/core/app/components/form/target/index.hbs b/ui/core/app/components/form/target/index.hbs
index e2f80fdde..20627adef 100644
--- a/ui/core/app/components/form/target/index.hbs
+++ b/ui/core/app/components/form/target/index.hbs
@@ -47,6 +47,44 @@
     {{/if}}
   </form.textarea>
 
+  <form.input
+    @name="session_max_seconds"
+    @type="number"
+    @value={{@model.session_max_seconds}}
+    @label={{t "form.session_max_seconds.label"}}
+    @error={{@model.errors.session_max_seconds}}
+    @helperText={{t "form.session_max_seconds.help"}}
+    min="0"
+    step="1"
+  as |field|>
+    {{#if @model.errors.session_max_seconds}}
+      <field.errors as |errors|>
+        {{#each @model.errors.session_max_seconds as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.input
+    @name="session_connection_limit"
+    @type="number"
+    @value={{@model.session_connection_limit}}
+    @label={{t "form.session_connection_limit.label"}}
+    @error={{@model.errors.session_connection_limit}}
+    @helperText={{t "form.session_connection_limit.help"}}
+    min="-1"
+    step="1"
+  as |field|>
+    {{#if @model.errors.session_connection_limit}}
+      <field.errors as |errors|>
+        {{#each @model.errors.session_connection_limit as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
   {{!-- TODO this is a type-specific field --}}
   <form.input
     @name="default_port"
diff --git a/ui/core/mirage/factories/target.js b/ui/core/mirage/factories/target.js
index fc090fde4..4f34cc459 100644
--- a/ui/core/mirage/factories/target.js
+++ b/ui/core/mirage/factories/target.js
@@ -7,6 +7,11 @@ const hostSetChance = 0.3;
 
 export default factory.extend({
 
+  /**
+   * -1 means "unlimited" and we want to generate these on occassion.
+   */
+  session_connection_limit: () => random.arrayElement([-1, random.number()]),
+
   /**
    * Generates attributes fields by type.
    */
diff --git a/ui/core/mirage/generated/factories/target.js b/ui/core/mirage/generated/factories/target.js
index 24915d9da..5ce21adeb 100644
--- a/ui/core/mirage/generated/factories/target.js
+++ b/ui/core/mirage/generated/factories/target.js
@@ -8,6 +8,8 @@ export default Factory.extend({
 
   type: 'tcp',
   name: () => random.words(),
+  session_max_seconds: () => random.number(),
+  session_connection_limit: () => random.number(),
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
diff --git a/ui/core/translations/form/en-us.yaml b/ui/core/translations/form/en-us.yaml
index 7bbf5c7bc..09f562a66 100644
--- a/ui/core/translations/form/en-us.yaml
+++ b/ui/core/translations/form/en-us.yaml
@@ -35,3 +35,9 @@ started:
   label: Started
 status:
   label: Status
+session_max_seconds:
+  label: Maximum Duration (in seconds)
+  help: The maximum duration of a session.
+session_connection_limit:
+  label: Maximum Connections
+  help: The maximum number of connections allowed per session.  For unlimited, specify "-1".