diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 9e38fdaa..7328344e 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1309,7 +1309,7 @@ proxy-qa-sto1-1.komreg.net:
       use_hsm: false
 
 ### TEST environment ####
-connector-test-sto3-1.komreg.net:
+'^connector-test-.+-\d+\.komreg\.net$':
    autoupdate:
    sunet::dockerhost2:
    eid::connector:
@@ -1329,66 +1329,12 @@ connector-test-sto3-1.komreg.net:
            - 'fe-tug-1.test.komreg.net'
          port: '443'
 
-connector-test-sto3-2.komreg.net:
-   autoupdate:
-   sunet::dockerhost2:
-   eid::connector:
-     environment: test
-     version: 2.0.3_hsm2_ubuntu
-   sunet::redictcluster:
-     hostmode: true
-     tls: true
-     maxmemory: 1gb
-     maxmemory_policy: volatile-ttl
-     automatic_rectify: true
-   sunet::frontend::register_sites:
-     sites:
-       'test.connector.eidas.swedenconnect.se':
-         frontends:
-           - 'fe-fre-1.test.komreg.net'
-           - 'fe-tug-1.test.komreg.net'
-         port: '443'
 
-connector-test-sto3-3.komreg.net:
-   autoupdate:
-   sunet::dockerhost2:
-   eid::connector:
-     environment: test
-     version: 2.0.3_hsm2_ubuntu
-   sunet::redictcluster:
-     hostmode: true
-     tls: true
-     maxmemory: 1gb
-     maxmemory_policy: volatile-ttl
-     automatic_rectify: true
-   sunet::frontend::register_sites:
-     sites:
-       'test.connector.eidas.swedenconnect.se':
-         frontends:
-           - 'fe-fre-1.test.komreg.net'
-           - 'fe-tug-1.test.komreg.net'
-         port: '443'
-
-proxy-test-sto3-1.komreg.net:
+'^proxy-test-.+-\d+\.komreg\.net$':
    autoupdate:
    sunet::dockerhost2:
    eid::proxy:
-      version: 3.0.8_hsm2
-      service_name: test.proxy.eidas.swedenconnect.se
-      environment: test
-   sunet::frontend::register_sites:
-     sites:
-       'test.proxy.eidas.swedenconnect.se':
-         frontends:
-           - 'fe-fre-1.test.komreg.net'
-           - 'fe-tug-1.test.komreg.net'
-         port: '443'
-
-proxy-test-sto3-2.komreg.net:
-   autoupdate:
-   sunet::dockerhost2:
-   eid::proxy:
-      version: 3.0.8_hsm2
+      version: 3.0.9_hsm2
       service_name: test.proxy.eidas.swedenconnect.se
       environment: test
    sunet::frontend::register_sites: