diff --git a/neutron/values_overrides/rocky.yaml b/neutron/values_overrides/rocky.yaml
new file mode 100644
index 0000000000..f08f676270
--- /dev/null
+++ b/neutron/values_overrides/rocky.yaml
@@ -0,0 +1,9 @@
+# Provide release specific overrides for Neutron configuration
+# e.g. removal of obsoleted options
+
+conf:
+  # api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens
+  # See https://docs.openstack.org/releasenotes/neutron/queens.html:
+  paste:
+    app:neutronversions:
+      paste.app_factory: neutron.pecan_wsgi.app:versions_factory
diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh
index b095941c1e..43059f925e 100755
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -88,9 +88,18 @@ conf:
       ovs:
         bridge_mappings: public:br-ex
 EOF
+
+if [ -n "$OSH_OPENSTACK_RELEASE" ]; then
+  if [ -e "./neutron/values_overrides/${OSH_OPENSTACK_RELEASE}.yaml" ] ; then
+    echo "Adding release overrides for ${OSH_OPENSTACK_RELEASE}"
+    OSH_RELEASE_OVERRIDES_NEUTRON="--values=./neutron/values_overrides/${OSH_OPENSTACK_RELEASE}.yaml"
+  fi
+fi
+
 helm upgrade --install neutron ./neutron \
     --namespace=openstack \
     --values=/tmp/neutron.yaml \
+    ${OSH_RELEASE_OVERRIDES_NEUTRON} \
     ${OSH_EXTRA_HELM_ARGS} \
     ${OSH_EXTRA_HELM_ARGS_NEUTRON}