diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py
index 4d38671e6..0c28506c6 100644
--- a/tripleo_common/constants.py
+++ b/tripleo_common/constants.py
@@ -81,12 +81,9 @@ PASSWORD_PARAMETER_NAMES = (
     'BarbicanSimpleCryptoKek',
     'CeilometerMeteringSecret',
     'CeilometerPassword',
-    'CephAdminKey',
     'CephClientKey',
     'CephClusterFSID',
-    'CephMdsKey',
     'CephManilaClientKey',
-    'CephMonKey',
     'CephRgwKey',
     'CephGrafanaAdminPassword',
     'CephDashboardAdminPassword',
diff --git a/tripleo_common/tests/actions/test_parameters.py b/tripleo_common/tests/actions/test_parameters.py
index aab0472d7..582ca1bc1 100644
--- a/tripleo_common/tests/actions/test_parameters.py
+++ b/tripleo_common/tests/actions/test_parameters.py
@@ -48,7 +48,6 @@ _EXISTING_PASSWORDS = {
     'RabbitPassword': 'ahuHRXdPMx9rzCdjD9CJJNCgA',
     'RpcPassword': 'ahuHRXdPMx9rzCdjD9CJJNCgA',
     'NotifyPassword': 'ahuHRXdPMx9rzCdjD9CJJNCgA',
-    'CephAdminKey': b'AQCQXtlXAAAAABAAT4Gk+U8EqqStL+JFa9bp1Q==',
     'HAProxyStatsPassword': 'P8tbdK6n4YUkTaUyy8XgEVTe6',
     'CeilometerPassword': 'RRdpwK6qf2pbKz2UtzxqauAdk',
     'GnocchiPassword': 'cRYHcUkMuJeK3vyU9pCaznUZc',
@@ -62,9 +61,7 @@ _EXISTING_PASSWORDS = {
     'OctaviaCaKeyPassphrase': 'SLj4c3uCk4DDxPwQOG1Heb==',
     'ManilaPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'NeutronMetadataProxySharedSecret': 'Q2YgUCwmBkYdqsdhhCF4hbghu',
-    'CephMdsKey': b'AQCQXtlXAAAAABAAT4Gk+U8EqqStL+JFa9bp1Q==',
     'CephManilaClientKey': b'AQANOFFY1NW6AxAAu6jWI3YSOsp2QWusb5Y3DQ==',
-    'CephMonKey': b'AQCQXtlXAAAAABAA9l+59N3yH+C49Y0JiKeGFg==',
     'CephGrafanaAdminPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'CephDashboardAdminPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'SwiftHashSuffix': 'td8mV6k7TYEGKCDvjVBwckpn9',