diff --git a/elements/keystone/install.d/keystone-package-install/05-keystone b/elements/keystone/install.d/keystone-package-install/05-keystone
index 31c698972..78b9c9932 100755
--- a/elements/keystone/install.d/keystone-package-install/05-keystone
+++ b/elements/keystone/install.d/keystone-package-install/05-keystone
@@ -3,8 +3,6 @@
 set -eux
 set -o pipefail
 
-install-packages openstack-keystone python-ldap
-
 KEYSTONE_USER=keystone
 if [ "opensuse" = "$DISTRO_NAME" ]; then
     KEYSTONE_USER=openstack-keystone
diff --git a/elements/keystone/install.d/keystone-package-install/package-installs-keystone b/elements/keystone/install.d/keystone-package-install/package-installs-keystone
new file mode 100644
index 000000000..2714a2b73
--- /dev/null
+++ b/elements/keystone/install.d/keystone-package-install/package-installs-keystone
@@ -0,0 +1,2 @@
+openstack-keystone
+python-ldap
diff --git a/elements/keystone/pkg-map b/elements/keystone/pkg-map
index 229f0fbcb..042900de7 100644
--- a/elements/keystone/pkg-map
+++ b/elements/keystone/pkg-map
@@ -8,12 +8,17 @@
     "debian": {
       "ldap_devel_package": "libldap2-dev",
       "sasl_devel_package": "libsasl2-dev",
-      "ssl_devel_package": "libssl-dev"
+      "ssl_devel_package": "libssl-dev",
+      "openstack-keystone": "keystone"
     },
     "suse": {
       "ldap_devel_package": "openldap2-devel",
       "sasl_devel_package": "cyrus-sasl-devel",
       "ssl_devel_package": "libopenssl-devel"
     }
+  },
+  "default": {
+    "openstack-keystone": "openstack-keystone",
+    "python-ldap": "python-ldap"
   }
 }