diff --git a/devsetup/Makefile b/devsetup/Makefile
index ab581a30..3f5cb43e 100644
--- a/devsetup/Makefile
+++ b/devsetup/Makefile
@@ -68,6 +68,7 @@ MANILA_SERVICE_ENABLED ?= true
 EDPM_TOTAL_NODES ?= 1
 RH_REGISTRY_USER ?= ""
 RH_REGISTRY_PWD ?= ""
+EDPM_CONFIGURE_HUGEPAGES ?= false
 EDPM_COMPUTE_CEPH_ENABLED ?= true
 EDPM_COMPUTE_CELLS ?= 1
 EDPM_COMPUTE_CEPH_NOVA ?= true
@@ -478,6 +479,7 @@ standalone_deploy: export BARBICAN_ENABLED=${BARBICAN_SERVICE_ENABLED}
 standalone_deploy: export MANILA_ENABLED=${MANILA_SERVICE_ENABLED}
 standalone_deploy: export CLOUD_DOMAIN=${DNS_DOMAIN}
 standalone_deploy: export COMPUTE_CEPH_ENABLED=${EDPM_COMPUTE_CEPH_ENABLED}
+standalone_deploy: export CONFIGURE_HUGEPAGES=${EDPM_CONFIGURE_HUGEPAGES}
 standalone_deploy: export COMPUTE_CEPH_NOVA=${EDPM_COMPUTE_CEPH_NOVA}
 standalone_deploy: export COMPUTE_SRIOV_ENABLED=${EDPM_COMPUTE_SRIOV_ENABLED}
 standalone_deploy: export COMPUTE_DHCP_AGENT_ENABLED=${EDPM_COMPUTE_DHCP_AGENT_ENABLED}
diff --git a/devsetup/scripts/standalone.sh b/devsetup/scripts/standalone.sh
index ee1d78fc..4ddc2e9a 100755
--- a/devsetup/scripts/standalone.sh
+++ b/devsetup/scripts/standalone.sh
@@ -44,6 +44,7 @@ CLEANUP_DIR_CMD=${CLEANUP_DIR_CMD:-"rm -Rf"}
 EDPM_COMPUTE_VCPUS=${COMPUTE_VCPUS:-8}
 EDPM_COMPUTE_RAM=${COMPUTE_RAM:-20}
 EDPM_COMPUTE_DISK_SIZE=${COMPUTE_DISK_SIZE:-70}
+EDPM_CONFIGURE_HUGEPAGES=${CONFIGURE_HUGEPAGES:-false}
 EDPM_COMPUTE_CEPH_ENABLED=${COMPUTE_CEPH_ENABLED:-true}
 EDPM_COMPUTE_CEPH_NOVA=${COMPUTE_CEPH_NOVA:-true}
 EDPM_COMPUTE_SRIOV_ENABLED=${COMPUTE_SRIOV_ENABLED:-true}
@@ -123,6 +124,7 @@ __EOF__
 export HOST_PRIMARY_RESOLV_CONF_ENTRY=${HOST_PRIMARY_RESOLV_CONF_ENTRY}
 export INTERFACE_MTU=${INTERFACE_MTU:-1500}
 export NTP_SERVER=${NTP_SERVER:-"pool.ntp.org"}
+export EDPM_CONFIGURE_HUGEPAGES=${EDPM_CONFIGURE_HUGEPAGES:-false}
 export EDPM_COMPUTE_CEPH_ENABLED=${EDPM_COMPUTE_CEPH_ENABLED:-true}
 export EDPM_COMPUTE_CEPH_NOVA=${EDPM_COMPUTE_CEPH_NOVA:-true}
 export CEPH_ARGS="${CEPH_ARGS:--e \$HOME/deployed_ceph.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/cephadm/cephadm-rbd-only.yaml}"
@@ -231,6 +233,7 @@ scp $SSH_OPT ${MY_TMP_DIR}/net_config.yaml root@$IP:/tmp/net_config.yaml
 scp $SSH_OPT ${MY_TMP_DIR}/network_data.yaml root@$IP:/tmp/network_data.yaml
 scp $SSH_OPT ${MY_TMP_DIR}/deployed_network.yaml root@$IP:/tmp/deployed_network.yaml
 scp $SSH_OPT ${MY_TMP_DIR}/Standalone.yaml root@$IP:/tmp/Standalone.yaml
+scp $SSH_OPT ${SCRIPTPATH}/../standalone/hugepages.yaml zuul@$IP:hugepages.yaml
 [[ "$EDPM_COMPUTE_CEPH_ENABLED" == "true" ]] && scp $SSH_OPT standalone/ceph.sh root@$IP:/tmp/ceph.sh
 scp $SSH_OPT standalone/openstack.sh root@$IP:/tmp/openstack.sh
 scp $SSH_OPT standalone/post_config/ironic.sh root@$IP:/tmp/ironic_post.sh
diff --git a/devsetup/standalone/hugepages.yaml b/devsetup/standalone/hugepages.yaml
new file mode 100644
index 00000000..c0ba44af
--- /dev/null
+++ b/devsetup/standalone/hugepages.yaml
@@ -0,0 +1,13 @@
+---
+parameter_defaults:
+  NovaSchedulerEnabledFilters:
+      - ComputeFilter
+      - ComputeCapabilitiesFilter
+      - ImagePropertiesFilter
+      - ServerGroupAntiAffinityFilter
+      - ServerGroupAffinityFilter
+      - PciPassthroughFilter
+      - NUMATopologyFilter
+  ComputeParameters:
+    NovaReservedHugePages: ["node:0,size:2M,count:1"]
+    KernelArgs: "default_hugepagesz=2M hugepagesz=2M hugepages=1"
diff --git a/devsetup/standalone/openstack.sh b/devsetup/standalone/openstack.sh
index 106fb4c3..ca6a27f9 100755
--- a/devsetup/standalone/openstack.sh
+++ b/devsetup/standalone/openstack.sh
@@ -15,6 +15,7 @@
 # under the License.
 set -ex
 
+EDPM_CONFIGURE_HUGEPAGES=${EDPM_CONFIGURE_HUGEPAGES:-false}
 EDPM_COMPUTE_CEPH_ENABLED=${EDPM_COMPUTE_CEPH_ENABLED:-true}
 EDPM_COMPUTE_SRIOV_ENABLED=${EDPM_COMPUTE_SRIOV_ENABLED:-true}
 EDPM_COMPUTE_DHCP_AGENT_ENABLED=${EDPM_COMPUTE_DHCP_AGENT_ENABLED:-true}
@@ -167,6 +168,9 @@ if [ "$EDPM_COMPUTE_SRIOV_ENABLED" = "true" ] ; then
     ENV_ARGS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/neutron-ovn-sriov.yaml"
     ENV_ARGS+=" -e $HOME/sriov_template.yaml"
 fi
+if [ "$EDPM_CONFIGURE_HUGEPAGES" = "true" ] ; then
+    ENV_ARGS+=" -e $HOME/hugepages.yaml"
+fi
 
 if [ "$SWIFT_REPLICATED" = "true" ]; then
 cat <<EOF >> standalone_parameters.yaml