diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py
index 81e529421..4fda6c225 100644
--- a/tripleo_common/constants.py
+++ b/tripleo_common/constants.py
@@ -82,6 +82,8 @@ PASSWORD_PARAMETER_NAMES = (
     'NeutronMetadataProxySharedSecret',
     'NeutronPassword',
     'NovaPassword',
+    'OctaviaHeartbeatKey',
+    'OctaviaPassword',
     'PankoPassword',
     'RabbitPassword',
     'RedisPassword',
diff --git a/tripleo_common/tests/actions/test_parameters.py b/tripleo_common/tests/actions/test_parameters.py
index bdf8ee274..0f4669023 100644
--- a/tripleo_common/tests/actions/test_parameters.py
+++ b/tripleo_common/tests/actions/test_parameters.py
@@ -43,6 +43,8 @@ _EXISTING_PASSWORDS = {
     'CephRgwKey': b'AQCQXtlXAAAAABAAUKcqUMu6oMjAXMjoUV4/3A==',
     'AodhPassword': '8VZXehsKc2HbmFFMKYuqxTJHn',
     'PankoPassword': 'cVZXehsSc2KdmFFMKDudxTLKn',
+    'OctaviaHeartbeatKey': 'oct-heartbeat-key',
+    'OctaviaPassword': 'NMl7j3nKk1VVwMxUZC8Cgw==',
     'ManilaPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'NeutronMetadataProxySharedSecret': 'Q2YgUCwmBkYdqsdhhCF4hbghu',
     'CephMdsKey': b'AQCQXtlXAAAAABAAT4Gk+U8EqqStL+JFa9bp1Q==',