diff --git a/netsim/ansible/tasks/readiness-check/junos.yml b/netsim/ansible/tasks/readiness-check/junos.yml
new file mode 100644
index 0000000000..1a12ba94f5
--- /dev/null
+++ b/netsim/ansible/tasks/readiness-check/junos.yml
@@ -0,0 +1,10 @@
+---
+- name: Wait for first interface ({{ interfaces[0].junos_interface }})
+  junos_command:
+    commands:
+    - show interfaces terse
+    wait_for:
+    - result[0] contains {{ interfaces[0].junos_interface }}
+    interval: 5
+    retries: 60
+  when: interfaces
diff --git a/netsim/ansible/tasks/readiness-check/vjunos-router.yml b/netsim/ansible/tasks/readiness-check/vjunos-router.yml
deleted file mode 120000
index d693399a23..0000000000
--- a/netsim/ansible/tasks/readiness-check/vjunos-router.yml
+++ /dev/null
@@ -1 +0,0 @@
-vjunos-switch.yml
\ No newline at end of file
diff --git a/netsim/ansible/tasks/readiness-check/vjunos-switch.yml b/netsim/ansible/tasks/readiness-check/vjunos-switch.yml
deleted file mode 100644
index 27c0b9e951..0000000000
--- a/netsim/ansible/tasks/readiness-check/vjunos-switch.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Wait for ge-0/0/0 to appear
-  junos_command:
-    commands:
-    - show interfaces terse
-    wait_for:
-    - result[0] contains ge-0/0/0
-    interval: 5
-    retries: 30
diff --git a/netsim/ansible/tasks/readiness-check/vptx.yml b/netsim/ansible/tasks/readiness-check/vptx.yml
deleted file mode 100644
index 0fed6ac1de..0000000000
--- a/netsim/ansible/tasks/readiness-check/vptx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Wait for et-0/0/0 to appear
-  junos_command:
-    commands:
-    - show interfaces terse
-    wait_for:
-    - result[0] contains et-0/0/0
-    interval: 5
-    retries: 60