diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index 210297ae77..ccded60c38 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -751,17 +751,21 @@ def openstack(cls):
                 'type': 'string'
             }, {
                 'id': 'password',
-                'label': 'Password',
+                'label': 'Password (API Key)',
                 'type': 'string',
                 'secret': True,
             }, {
                 'id': 'host',
-                'label': 'Host',
+                'label': 'Host (Authentication URL)',
                 'type': 'string',
             }, {
                 'id': 'project',
-                'label': 'Project',
+                'label': 'Project (Tenant Name)',
                 'type': 'string',
+            }, {
+                'id': 'domain',
+                'label': 'Domain Name',
+                'type': 'string'
             }],
             'required': ['username', 'password', 'host', 'project']
         }
diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py
index 6e7593f1a9..cb4ce9f909 100644
--- a/awx/main/tests/unit/test_tasks.py
+++ b/awx/main/tests/unit/test_tasks.py
@@ -122,7 +122,7 @@ def test_openstack_client_config_generation(mocker):
         'credential.username': 'demo',
         'credential.password': 'secrete',
         'credential.project': 'demo-project',
-        'credential.domain': None,
+        'credential.domain': 'my-demo-domain',
         'source_vars_dict': {}
     })
     cloud_config = update.build_private_data(inventory_update)
@@ -135,7 +135,8 @@ def test_openstack_client_config_generation(mocker):
                 'auth_url': 'https://keystone.openstack.example.org',
                 'password': 'secrete',
                 'project_name': 'demo-project',
-                'username': 'demo'
+                'username': 'demo',
+                'domain_name': 'my-demo-domain',
             },
             'private': True
         }