diff --git a/devstack/upgrade/from-2025.1/upgrade-octavia b/devstack/upgrade/from-2025.1/upgrade-octavia
new file mode 100644
index 0000000000..9d573b55f8
--- /dev/null
+++ b/devstack/upgrade/from-2025.1/upgrade-octavia
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Openstack moved from using wsgi scripts to directly calling the wsgi module
+# due to changes in setuptools that stops the pbr wsgi_scripts from working.
+# This script will reconfigure uwsgi on upgrade to point to the module instead
+# of the wsgi script that is no longer present in octavia.
+
+function configure_octavia_upgrade {
+    source $GRENADE_DIR/functions
+
+    iniset $OCTAVIA_UWSGI_CONF uwsgi module $OCTAVIA_UWSGI_APP
+}
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 5cbd40ad11..5f18828c9f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -65,7 +65,6 @@
               - ^tools/.*$
               - ^(test-|)requirements.txt$
               - ^tox.ini$
-            voting: false  # due to LP#2109665
         - octavia-grenade-skip-level:
             irrelevant-files: *grenade-irrelevant-files
             voting: false
@@ -107,8 +106,7 @@
         - octavia-v2-dsvm-scenario-traffic-ops-ubuntu-jammy
         - octavia-v2-dsvm-scenario-non-traffic-ops-ubuntu-jammy
         - octavia-v2-dsvm-tls-barbican
-        - octavia-grenade:
-            voting: false
+        - octavia-grenade
         #- octavia-grenade-skip-level
     periodic:
       jobs: