diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 06ccf86d1a..1bde080356 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -117,11 +117,6 @@ parameters:
     description: >
         Set to true to enable the SQLAlchemy-collectd server plugin
     default: false
-  AdminEmail:
-    default: 'admin@example.com'
-    description: The email for the keystone admin account.
-    type: string
-    hidden: true
   AdminToken:
     description: The keystone auth secret and db password.
     type: string
diff --git a/releasenotes/notes/remove-AdminEmail-70cf5b218f916734.yaml b/releasenotes/notes/remove-AdminEmail-70cf5b218f916734.yaml
new file mode 100644
index 0000000000..aab7d7aff1
--- /dev/null
+++ b/releasenotes/notes/remove-AdminEmail-70cf5b218f916734.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The AdminEmail parameter has been removed because it has had no effect
+    since TripleO had bootstrap support implemented.