diff --git a/ci-scripts/tests/README.md b/ci-scripts/tests/README.md
index 1083f78e61..f926ea4ac5 100644
--- a/ci-scripts/tests/README.md
+++ b/ci-scripts/tests/README.md
@@ -10,7 +10,10 @@ start with
     python tests/ping-iperf.py -v
     python tests/iperf-analysis.py -v
 
-It will indicate if all tests passed.
+It will indicate if all tests passed. It assumes that these images are present:
+
+- `oai-ci/oai-nr-ue:develop-12345678`
+- `oai-ci/oai-gnb:develop-12345678`
 
 # test-runner test
 
diff --git a/ci-scripts/tests/deployment.py b/ci-scripts/tests/deployment.py
index 4de3bb0889..a6cf8e06b0 100644
--- a/ci-scripts/tests/deployment.py
+++ b/ci-scripts/tests/deployment.py
@@ -23,10 +23,10 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.ci = cls_oaicitest.OaiCiTest()
 		self.cont = cls_containerize.Containerize()
 		self.ran = ran.RANManagement()
-		self.cont.yamlPath[0] = 'tests/simple-dep/'
+		self.cont.yamlPath[0] = ''
 		self.cont.ranAllowMerge = True
-		self.cont.ranBranch = 'develop'
-		self.cont.ranCommitID = '1234567890'
+		self.cont.ranBranch = ''
+		self.cont.ranCommitID = ''
 		self.cont.eNB_serverId[0] = '0'
 		self.cont.eNBIPAddress = 'localhost'
 		self.cont.eNBUserName = None
@@ -34,17 +34,51 @@ class TestDeploymentMethods(unittest.TestCase):
 		self.cont.eNBSourceCodePath = os.getcwd()
 
 	def test_deploy(self):
-		success = self.cont.DeployObject(self.html)
-		self.assertTrue(success)
-		self.cont.UndeployObject(self.html, self.ran)
+		self.cont.yamlPath[0] = 'tests/simple-dep/'
+		self.cont.deploymentTag = "noble"
+		deploy = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
+		self.assertTrue(deploy)
+		self.assertTrue(undeploy)
 
 	def test_deployfails(self):
+		# fails reliably
 		old = self.cont.yamlPath
 		self.cont.yamlPath[0] = 'tests/simple-fail/'
-		success = self.cont.DeployObject(self.html)
-		self.assertFalse(success)
+		deploy = self.cont.DeployObject(self.html)
 		self.cont.UndeployObject(self.html, self.ran)
+		self.assertFalse(deploy)
 		self.cont.yamlPath = old
 
+	def test_deploy_ran(self):
+		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
+		self.cont.services[0] = "oai-gnb"
+		self.cont.deploymentTag = 'develop-12345678'
+		deploy = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
+		self.assertTrue(deploy)
+		self.assertTrue(undeploy)
+
+	def test_deploy_multiran(self):
+		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
+		self.cont.services[0] = "oai-gnb oai-nr-ue"
+		self.cont.deploymentTag = 'develop-12345678'
+		deploy = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
+		self.assertTrue(deploy)
+		self.assertTrue(undeploy)
+
+	def test_deploy_staged(self):
+		self.cont.yamlPath[0] = 'yaml_files/5g_rfsimulator_tdd_dora'
+		self.cont.services[0] = "oai-gnb"
+		self.cont.deploymentTag = 'develop-12345678'
+		deploy1 = self.cont.DeployObject(self.html)
+		self.cont.services[0] = "oai-nr-ue"
+		deploy2 = self.cont.DeployObject(self.html)
+		undeploy = self.cont.UndeployObject(self.html, self.ran)
+		self.assertTrue(deploy1)
+		self.assertTrue(deploy2)
+		self.assertTrue(undeploy)
+
 if __name__ == '__main__':
 	unittest.main()
diff --git a/ci-scripts/tests/simple-dep/docker-compose.yml b/ci-scripts/tests/simple-dep/docker-compose.yml
index 950e30a814..058bba9931 100644
--- a/ci-scripts/tests/simple-dep/docker-compose.yml
+++ b/ci-scripts/tests/simple-dep/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   test:
-    image: ubuntu:jammy
+    image: ubuntu:${TAG:-jammy}
     container_name: test_container
     cap_drop:
       - ALL
diff --git a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
index f5a3d9a042..89f6562697 100644
--- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
     oai-gnb:
-        image: oaisoftwarealliance/oai-gnb:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         container_name: rfsim5g-oai-gnb
         cap_drop:
             - ALL
@@ -25,7 +25,7 @@ services:
             retries: 5
 
     oai-nr-ue:
-        image: oaisoftwarealliance/oai-nr-ue:develop
+        image: ${REGISTRY:-oaisoftwarealliance}/${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
         container_name: rfsim5g-oai-nr-ue
         cap_drop:
             - ALL