diff --git a/src/templates/99-charm-octavia-o-hm0.network b/src/templates/99-charm-octavia-o-hm0.network
index b0851b3a..c3d85f4f 100644
--- a/src/templates/99-charm-octavia-o-hm0.network
+++ b/src/templates/99-charm-octavia-o-hm0.network
@@ -14,3 +14,4 @@ DHCP=yes
 UseMTU=true
 UseRoutes=false
 RouteMetric=100
+UseDomains=route
diff --git a/src/tests/bundles/bionic-rocky-ha.yaml b/src/tests/bundles/bionic-rocky-ha.yaml
index 53a95507..83a0c3db 100644
--- a/src/tests/bundles/bionic-rocky-ha.yaml
+++ b/src/tests/bundles/bionic-rocky-ha.yaml
@@ -159,6 +159,7 @@ applications:
     options:
       amp-image-tag: 'octavia-amphora'
       retrofit-uca-pocket: rocky
+      retrofit-series: bionic
   vault:
     charm: cs:~openstack-charmers-next/vault
     num_units: 1
diff --git a/src/tests/bundles/bionic-rocky-lxd.yaml b/src/tests/bundles/bionic-rocky-lxd.yaml
index 0235736b..084ae037 100644
--- a/src/tests/bundles/bionic-rocky-lxd.yaml
+++ b/src/tests/bundles/bionic-rocky-lxd.yaml
@@ -180,6 +180,7 @@ applications:
     charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit
     options:
       amp-image-tag: 'octavia-amphora'
+      retrofit-series: bionic
   vault:
     charm: cs:~openstack-charmers-next/vault
     num_units: 1
diff --git a/src/tests/bundles/bionic-stein-ha.yaml b/src/tests/bundles/bionic-stein-ha.yaml
index 7cc25a78..95459afc 100644
--- a/src/tests/bundles/bionic-stein-ha.yaml
+++ b/src/tests/bundles/bionic-stein-ha.yaml
@@ -159,6 +159,7 @@ applications:
     options:
       amp-image-tag: 'octavia-amphora'
       retrofit-uca-pocket: stein
+      retrofit-series: bionic
   vault:
     charm: cs:~openstack-charmers-next/vault
     num_units: 1
diff --git a/src/tests/bundles/bionic-train-ha-ovn.yaml b/src/tests/bundles/bionic-train-ha-ovn.yaml
index d71c8338..5db64755 100644
--- a/src/tests/bundles/bionic-train-ha-ovn.yaml
+++ b/src/tests/bundles/bionic-train-ha-ovn.yaml
@@ -151,6 +151,7 @@ applications:
     options:
       amp-image-tag: 'octavia-amphora'
       retrofit-uca-pocket: train
+      retrofit-series: bionic
   placement:
     charm: cs:~openstack-charmers-next/placement
     num_units: 1
diff --git a/src/tests/bundles/bionic-train-ha.yaml b/src/tests/bundles/bionic-train-ha.yaml
index 9f08b3a3..febc0ee4 100644
--- a/src/tests/bundles/bionic-train-ha.yaml
+++ b/src/tests/bundles/bionic-train-ha.yaml
@@ -164,6 +164,7 @@ applications:
     options:
       amp-image-tag: 'octavia-amphora'
       retrofit-uca-pocket: train
+      retrofit-series: bionic
   placement:
     charm: cs:~openstack-charmers-next/placement
     num_units: 1