diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-gtw0.yaml
index d3e1c46..9a6e795 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-gtw0.yaml
@@ -28,7 +28,7 @@
   tunnel_interface: 'ens8'
   worker_metadata: {"labels": {"openstack-control-plane":"enabled","openvswitch":"enabled","openstack-gateway":"enabled","local-volume-provisioner": "enabled"}}
   cmp_metadata: {"labels": {"openstack-compute-node":"enabled","openvswitch":"enabled", "role":"ceph-osd-node"}}
-  acmp_metadata: {"labels": {"openstack-compute-node":"enabled","openstack-compute-node-dpdk":"enabled","openvswitch":"enabled"}}
+  acmp_metadata: {"labels": {"openstack-compute-node":"enabled","openstack-compute-node-hugepages":"enabled","openvswitch":"enabled"}}
   gtw_metadata: {"labels": {"openvswitch":"enabled"}}
   # hardware_metadata which is used for Ceph requires flavor with
   # ephemeral storage because it is used for Ceph bluestore.
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
index 675ae1b..e83c0c0 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-acmp2-ntw3.yaml
@@ -25,6 +25,7 @@
   cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
   tungstenfabric_enabled: true
   vsrx_enabled: true
+  dpdk_enabled: true
   private_floating_network_cidr: '10.11.12.0/24'
   private_floating_network_gateway: '10.11.12.1'
   private_floating_interface: 'ens4'
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index f21e7fb..c383648 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -135,6 +135,9 @@
   devops_utils_refspec:
     type: string
     default: 'master'
+  dpdk_enabled:
+    type: boolean
+    default: false
 
 resources:
 
@@ -183,6 +186,7 @@
             $cinder_lvm_loop_device_size: { get_param: cinder_lvm_loop_device_size }
             $kubectl_version: { get_param: kubectl_version }
             $devops_utils_refspec: { get_param: devops_utils_refspec }
+            $dpdk_enabled: { get_param: dpdk_enabled }
 
   inject_files:
     type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/scripts/functions.sh b/de/heat-templates/scripts/functions.sh
index df2c393..b8bde38 100644
--- a/de/heat-templates/scripts/functions.sh
+++ b/de/heat-templates/scripts/functions.sh
@@ -71,7 +71,7 @@
 TUNGSTENFABRIC_ENABLED=${TUNGSTENFABRIC_ENABLED:-false}
 if [[ "${HUGE_PAGES_1G_SIZE}" -gt 0 ]] || [[ "${HUGE_PAGES_2Mb_SIZE}" -gt 0 ]]; then
     CONFIGURE_HUGE_PAGES=true
-    if [[ "${TUNGSTENFABRIC_ENABLED,,}" == false ]]; then
+    if [[ "${TUNGSTENFABRIC_ENABLED,,}" == false ]] && [[ "${DPDK_ENABLED}" == true ]]; then
         TUNNEL_INTERFACE_NETPLAN_MANAGE=false
     fi
 fi
@@ -203,7 +203,7 @@
 function install_required_packages {
     local pkg_list="apt-transport-https ca-certificates curl software-properties-common jq unzip atop iptables-persistent socat ntp rng-tools open-iscsi nfs-common"
 
-    if [[ "${CONFIGURE_HUGE_PAGES}" == true ]]; then
+    if [[ "${DPDK_ENABLED}" == true ]]; then
         # Since jammy the igb_uio kernel module contains in the dpdk-kmods-dkms package
         if [[ ${CODENAME} == "bionic" ]] || [[ ${CODENAME} == "focal" ]]; then
             pkg_list="$pkg_list dpdk-igb-uio-dkms"
diff --git a/de/heat-templates/scripts/launch.sh b/de/heat-templates/scripts/launch.sh
index 060c42c..ece901d 100644
--- a/de/heat-templates/scripts/launch.sh
+++ b/de/heat-templates/scripts/launch.sh
@@ -49,6 +49,7 @@
 IRONIC_MT_ENABLED=${IRONIC_MT_ENABLED:-$ironic_mt_enabled}
 
 HUGE_PAGES=${HUGE_PAGES:-$huge_pages}
+DPDK_ENABLED=${DPDK_ENABLED:-$dpdk_enabled}
 TUNGSTENFABRIC_ENABLED=${TUNGSTENFABRIC_ENABLED:-$tungstenfabric_enabled}
 SINGLE_NODE=${SINGLE_NODE:-$single_node}
 DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL:-$docker_default_address_pool}
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 552edd2..afcc59e 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -446,6 +446,9 @@
   external_services_network_ipam_pool_end:
     type: string
     default: '10.172.1.99'
+  dpdk_enabled:
+    type: boolean
+    default: false
 
 conditions:
   aio_deploy:
@@ -851,6 +854,7 @@
           availability_zone: { get_param: availability_zone }
           kubectl_version: { get_param: kubectl_version }
           devops_utils_refspec: { get_param: devops_utils_refspec }
+          dpdk_enabled: { get_param: dpdk_enabled }
 
   gtws:
     type: OS::Heat::ResourceGroup
@@ -1359,3 +1363,5 @@
   evpn_network_pool_end:
     description: IPAM pool end for evpn tests
     value: { get_param: evpn_network_pool_end }
+  dpdk_enabled:
+    value: { get_param: dpdk_enabled }