diff --git a/roles/edpm_frr/molecule/default/converge.yml b/roles/edpm_frr/molecule/default/converge.yml
new file mode 100644
index 000000000..e604fe334
--- /dev/null
+++ b/roles/edpm_frr/molecule/default/converge.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, 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.
+
+- name: Converge
+  hosts: all
+  roles:
+    - role: "osp.edpm.edpm_frr"
+      become: true
diff --git a/roles/edpm_frr/molecule/default/molecule.yml b/roles/edpm_frr/molecule/default/molecule.yml
index 9b9dc5722..972e9af7a 100644
--- a/roles/edpm_frr/molecule/default/molecule.yml
+++ b/roles/edpm_frr/molecule/default/molecule.yml
@@ -4,17 +4,15 @@ dependency:
   options:
     role-file: collections.yml
 driver:
-  name: podman
+  name: delegated
+  options:
+    managed: false
+    ansible_connection_options:
+      ansible_connection: local
 platforms:
-- command: /sbin/init
-  dockerfile: ../../../../molecule/common/Containerfile.j2
-  image: ${EDPM_ANSIBLE_MOLECULE_IMAGE:-"ubi9/ubi-init"}
-  name: instance
-  privileged: true
-  registry:
-    url: ${EDPM_ANSIBLE_MOLECULE_REGISTRY:-"registry.access.redhat.com"}
-  ulimits:
-  - host
+  - name: compute-1
+    groups:
+      - compute
 provisioner:
   log: true
   name: ansible
diff --git a/roles/edpm_frr/molecule/default/prepare.yml b/roles/edpm_frr/molecule/default/prepare.yml
index eb69db884..10949e2a9 100644
--- a/roles/edpm_frr/molecule/default/prepare.yml
+++ b/roles/edpm_frr/molecule/default/prepare.yml
@@ -17,3 +17,9 @@
   hosts: all
   roles:
     - role: ../../../../molecule/common/test_deps
+      test_deps_extra_packages:
+        python3-pip
+  tasks:
+    - name: Install os-net-config
+      ansible.builtin.pip:
+        name: os-net-config
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 75d19d363..2c659467d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -36,3 +36,8 @@
     parent: edpm-ansible-molecule-base
     vars:
       TEST_RUN: edpm_nova
+- job:
+    name: edpm-ansible-molecule-edpm_frr
+    parent: edpm-ansible-molecule-base
+    vars:
+      TEST_RUN: edpm_frr
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index fcecaa913..824f88ae3 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -10,3 +10,4 @@
         - edpm-ansible-molecule-edpm_kernel
         - edpm-ansible-molecule-edpm_libvirt
         - edpm-ansible-molecule-edpm_nova
+        - edpm-ansible-molecule-edpm_frr