diff --git a/docs/api/sipcluster.md b/docs/api/sipcluster.md
index 4d003df..8a59468 100644
--- a/docs/api/sipcluster.md
+++ b/docs/api/sipcluster.md
@@ -222,6 +222,34 @@ service since we have the below node port range instead.</p>
 </table>
 </div>
 </div>
+<h3 id="airship.airshipit.org/v1.NetworkData">NetworkData
+</h3>
+<div class="md-typeset__scrollwrap">
+<div class="md-typeset__table">
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>networks</code><br>
+<em>
+<a href="#airship.airshipit.org/v1.OpenstackNetwork">
+[]OpenstackNetwork
+</a>
+</em>
+</td>
+<td>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 <h3 id="airship.airshipit.org/v1.NodeCount">NodeCount
 </h3>
 <p>
@@ -333,6 +361,46 @@ NodeCount
 </table>
 </div>
 </div>
+<h3 id="airship.airshipit.org/v1.OpenstackNetwork">OpenstackNetwork
+</h3>
+<p>
+(<em>Appears on:</em>
+<a href="#airship.airshipit.org/v1.NetworkData">NetworkData</a>)
+</p>
+<div class="md-typeset__scrollwrap">
+<div class="md-typeset__table">
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>id</code><br>
+<em>
+string
+</em>
+</td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
+<code>ip_address</code><br>
+<em>
+string
+</em>
+</td>
+<td>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 <h3 id="airship.airshipit.org/v1.PortRange">PortRange
 </h3>
 <p>
diff --git a/pkg/services/services_test.go b/pkg/services/services_test.go
index 8b2856d..9a9e2a1 100644
--- a/pkg/services/services_test.go
+++ b/pkg/services/services_test.go
@@ -62,7 +62,7 @@ var _ = Describe("Service Set", func() {
 			BMH: *bmh1,
 			Data: &bmh.MachineData{
 				IPOnInterface: map[string]string{
-					"eno3": ip1,
+					"oam-ipv4": ip1,
 				},
 			},
 		}
@@ -71,7 +71,7 @@ var _ = Describe("Service Set", func() {
 			BMH: *bmh2,
 			Data: &bmh.MachineData{
 				IPOnInterface: map[string]string{
-					"eno3": ip2,
+					"oam-ipv4": ip2,
 				},
 			},
 		}
diff --git a/playbooks/integration-tests.yaml b/playbooks/integration-tests.yaml
index 570593a..3742f5b 100644
--- a/playbooks/integration-tests.yaml
+++ b/playbooks/integration-tests.yaml
@@ -1,4 +1,4 @@
-- hosts: ubuntu-bionic
+- hosts: ubuntu-focal
   tasks:
     - name: Run docker-install
       include_role:
diff --git a/playbooks/publish-images.yaml b/playbooks/publish-images.yaml
index ba35799..241c0fa 100644
--- a/playbooks/publish-images.yaml
+++ b/playbooks/publish-images.yaml
@@ -9,7 +9,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-- hosts: ubuntu-bionic
+- hosts: ubuntu-focal
   tasks:
     - name: Setup Docker
       include_role:
diff --git a/playbooks/test-sip.yaml b/playbooks/test-sip.yaml
index 0ab3259..ba6a0bb 100644
--- a/playbooks/test-sip.yaml
+++ b/playbooks/test-sip.yaml
@@ -1,4 +1,4 @@
-- hosts: ubuntu-bionic
+- hosts: ubuntu-focal
   environment:
     GOROOT: '/usr/local/go'
     GOBIN: /tmp/bin/
diff --git a/testutil/testutil.go b/testutil/testutil.go
index 973792f..841502b 100644
--- a/testutil/testutil.go
+++ b/testutil/testutil.go
@@ -365,7 +365,7 @@ func CreateSIPCluster(name string, namespace string, controlPlanes int, workers
 						{
 							SIPClusterService: airshipv1.SIPClusterService{
 								Image:         "quay.io/airshipit/jump-host",
-								NodeInterface: "eno3",
+								NodeInterface: "oam-ipv4",
 							},
 							NodePort: 30000,
 							SSHAuthorizedKeys: []string{
@@ -378,7 +378,7 @@ func CreateSIPCluster(name string, namespace string, controlPlanes int, workers
 					LoadBalancerControlPlane: []airshipv1.LoadBalancerServiceControlPlane{
 						{
 							SIPClusterService: airshipv1.SIPClusterService{
-								NodeInterface: "eno3",
+								NodeInterface: "oam-ipv4",
 							},
 							NodePort: 30001,
 						},
@@ -386,7 +386,7 @@ func CreateSIPCluster(name string, namespace string, controlPlanes int, workers
 					LoadBalancerWorker: []airshipv1.LoadBalancerServiceWorker{
 						{
 							SIPClusterService: airshipv1.SIPClusterService{
-								NodeInterface: "eno3",
+								NodeInterface: "oam-ipv4",
 							},
 							NodePortRange: airshipv1.PortRange{
 								Start: 30002,
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 33ceb30..3dbacc6 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -10,6 +10,7 @@
         pass-to-parent: true
 - job:
     name: airship-deploy-sip
+    nodeset: ubuntu-focal
     run: playbooks/integration-tests.yaml
     description: Deploys kubernetes and sip
     roles:
@@ -17,6 +18,7 @@
     timeout: 9600
 - job:
     name: airship-sip-test-suite
+    nodeset: ubuntu-focal
     description: Install kube-builder and tests make functionality.
     run: playbooks/test-sip.yaml
     roles:
@@ -24,6 +26,7 @@
     timeout: 9600
 - job:
     name: airship-sip-publish-images
+    nodeset: ubuntu-focal
     description: Publishes SIP Docker images to image repository.
     run: playbooks/publish-images.yaml
     roles: