diff --git a/environments/standalone.yaml b/environments/standalone.yaml
index 10417e2a24..657335bc94 100644
--- a/environments/standalone.yaml
+++ b/environments/standalone.yaml
@@ -14,10 +14,3 @@ parameter_defaults:
   StackAction: CREATE
   SoftwareConfigTransport: POLL_SERVER_HEAT
   EnablePackageInstall: true
-  # Needed for deployed server bits
-  # FIXME(aschultz): remove after https://review.openstack.org/#/c/567951/
-  HostnameMap:
-    undercloud-standalone-0: undercloud
-  # Needed for deploying standalone
-  # FIXME(aschultz): remove after https://review.openstack.org/#/c/566752/
-  deployment_source_hosts: overcloud