diff --git a/.github/workflows/action.yaml b/.github/workflows/action.yaml
index a21746b..63e151e 100644
--- a/.github/workflows/action.yaml
+++ b/.github/workflows/action.yaml
@@ -11,9 +11,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: hadolint for controller
-        run: docker run -e "HADOLINT_IGNORE=DL3008" --rm -i hadolint/hadolint < controller/Dockerfile
+        run: docker run -e "HADOLINT_IGNORE=DL3008,DL3064" --rm -i hadolint/hadolint:v2.15.1 < controller/Dockerfile
       - name: hadolint for compute
-        run: docker run -e "HADOLINT_IGNORE=DL3008" --rm -i hadolint/hadolint < compute/Dockerfile
+        run: docker run -e "HADOLINT_IGNORE=DL3008,DL3064" --rm -i hadolint/hadolint:v2.15.1 < compute/Dockerfile
   test:
     runs-on: ubuntu-24.04
     steps:
diff --git a/compute/Dockerfile b/compute/Dockerfile
index 17fa129..1a0dca4 100644
--- a/compute/Dockerfile
+++ b/compute/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:24.04
 
 EXPOSE 80 5000 8773 8774 8775 8776 9292
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DEVSTACK_COMMIT=a05d26ebc4ca81ccf1810c9c203143db552c28cb
+ENV DEVSTACK_COMMIT=9b0a00865c2537338f72ed5b9b44a0d6bff16eb4
 
 ENV OS_REGION_NAME=RegionOne
 ENV OS_PROJECT_DOMAIN_ID=default
diff --git a/controller/Dockerfile b/controller/Dockerfile
index 1594cf5..8db7dfc 100644
--- a/controller/Dockerfile
+++ b/controller/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:24.04
 
 EXPOSE 80 5000 8773 8774 8775 8776 9292
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DEVSTACK_COMMIT=a05d26ebc4ca81ccf1810c9c203143db552c28cb
+ENV DEVSTACK_COMMIT=9b0a00865c2537338f72ed5b9b44a0d6bff16eb4
 
 ENV OS_REGION_NAME=RegionOne
 ENV OS_PROJECT_DOMAIN_ID=default
diff --git a/controller/local.conf b/controller/local.conf
index b8a11b7..4352cd3 100644
--- a/controller/local.conf
+++ b/controller/local.conf
@@ -54,6 +54,10 @@ disable_service file_tracker
 # Use openvswitch as the ml2 plugin driver
 Q_AGENT=openvswitch
 
+# Allocate project networks as VXLAN. DevStack defaults this to geneve,
+# which the openvswitch agent does not tunnel, so it must be set here.
+Q_ML2_TENANT_NETWORK_TYPE=vxlan
+
 # Enable Neutron services neutron-server, neutron-openvswitch-agent,
 # neutron-dhcp-agent, neutron-l3-agent and neutron-metadata-agent
 enable_service q-svc
@@ -77,7 +81,7 @@ verbose = True
 [[post-config|/$Q_PLUGIN_CONF_FILE]]
 [ml2]
 type_drivers=flat,gre,vlan,vxlan
-tenant_network_types=vxlan
+project_network_types=vxlan
 mechanism_drivers=openvswitch,l2population
 
 [agent]