diff --git a/selftest/conf/resources.conf b/selftest/conf/resources.conf
index 2005590..b186737 100644
--- a/selftest/conf/resources.conf
+++ b/selftest/conf/resources.conf
@@ -1,32 +1,41 @@
 # all hardware and interfaces available to this osmo-gsm-tester
 
 ip_address:
-- addr: 10.42.42.1
 - addr: 10.42.42.2
 - addr: 10.42.42.3
+- addr: 10.42.42.4
+- addr: 10.42.42.5
+- addr: 10.42.42.6
 
 bts:
 - label: sysmoBTS 1002
-  type: sysmo
+  type: osmo-bts-sysmo
   ipa_unit_id: 1
   addr: 10.42.42.114
   band: GSM-1800
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'
 
-- label: octBTS 3000
-  type: oct
-  ipa_unit_id: 5
-  addr: 10.42.42.115
+- label: Ettus B200
+  type: osmo-bts-trx
+  ipa_unit_id: 6
+  addr: 10.42.42.50
   band: GSM-1800
-  trx_list:
-  - hw_addr: 00:0c:90:32:b5:8a
+  launch_trx: true
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'
 
-- label: nanoBTS 1900
-  type: nanobts
-  ipa_unit_id: 1902
-  addr: 10.42.42.190
-  band: GSM-1900
-  trx_list:
-  - hw_addr: 00:02:95:00:41:b3
+- label: sysmoCell 5000
+  type: osmo-bts-trx
+  ipa_unit_id: 7
+  addr: 10.42.42.51
+  band: GSM-1800
+  trx_remote_ip: 10.42.42.112
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'
 
 arfcn:
   - arfcn: 512
@@ -39,7 +48,6 @@
     band: GSM-1800
   - arfcn: 520
     band: GSM-1800
-
   - arfcn: 540
     band: GSM-1900
   - arfcn: 542
@@ -52,82 +60,38 @@
     band: GSM-1900
 
 modem:
-- label: m7801
-  path: '/wavecom_0'
-  imsi: 901700000007801
-  ki: D620F48487B1B782DA55DF6717F08FF9
+- label: sierra_1
+  path: '/sierra_1'
+  imsi: '901700000009031'
+  ki: '80A37E6FDEA931EAC92FFA5F671EFEAD'
+  auth_algo: 'xor'
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'
 
-- label: m7802
-  path: '/wavecom_1'
-  imsi: 901700000007802
-  ki: 47FDB2D55CE6A10A85ABDAD034A5B7B3
+- label: sierra_2
+  path: '/sierra_2'
+  imsi: '901700000009029'
+  ki: '00969E283349D354A8239E877F2E0866'
+  auth_algo: 'xor'
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'
 
-- label: m7803
-  path: '/wavecom_2'
-  imsi: 901700000007803
-  ki: ABBED4C91417DF710F60675B6EE2C8D2
+- label: gobi_0
+  path: '/gobi_0'
+  imsi: '901700000009030'
+  ki: 'BB70807226393CDBAC8DD3439FF54252'
+  auth_algo: 'xor'
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'
 
-- label: m7804
-  path: '/wavecom_3'
-  imsi: 901700000007804
-  ki: 8BA541179156F2BF0918CA3CFF9351B0
-
-- label: m7805
-  path: '/wavecom_4'
-  imsi: 901700000007805
-  ki: 82BEC24B5B50C9FAA69D17DEC0883A23
-
-- label: m7806
-  path: '/wavecom_5'
-  imsi: 901700000007806
-  ki: DAF6BD6A188F7A4F09866030BF0F723D
-
-- label: m7807
-  path: '/wavecom_6'
-  imsi: 901700000007807
-  ki: AEB411CFE39681A6352A1EAE4DDC9DBA
-
-- label: m7808
-  path: '/wavecom_7'
-  imsi: 901700000007808
-  ki: F5DEF8692B305D7A65C677CA9EEE09C4
-
-- label: m7809
-  path: '/wavecom_8'
-  imsi: 901700000007809
-  ki: A644F4503E812FD75329B1C8D625DA44
-
-- label: m7810
-  path: '/wavecom_9'
-  imsi: 901700000007810
-  ki: EF663BDF3477DCD18D3D2293A2BAED67
-
-- label: m7811
-  path: '/wavecom_10'
-  imsi: 901700000007811
-  ki: E88F37F048A86A9BC4D652539228C039
-
-- label: m7812
-  path: '/wavecom_11'
-  imsi: 901700000007812
-  ki: E8D940DD66FCF6F1CD2C0F8F8C45633D
-
-- label: m7813
-  path: '/wavecom_12'
-  imsi: 901700000007813
-  ki: DBF534700C10141C49F699B0419107E3
-
-- label: m7814
-  path: '/wavecom_13'
-  imsi: 901700000007814
-  ki: B36021DEB90C4EA607E408A92F3B024D
-
-- label: m7815
-  path: '/wavecom_14'
-  imsi: 901700000007815
-  ki: 1E209F6F839F9195778C4F96BE281A24
-
-- label: m7816
-  path: '/wavecom_15'
-  imsi: 901700000007816
-  ki: BF827D219E739DD189F6F59E60D6455C
+- label: gobi_3
+  path: '/gobi_3'
+  imsi: '901700000009032'
+  ki: '2F70DCA43C45ACB97E947FDD0C7CA30A'
+  auth_algo: 'xor'
+  ciphers:
+  - 'a5_0'
+  - 'a5_1'