diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index fb0f513..8942605 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -60,10 +60,3 @@
       - pahol@sunet.se
       - thorslund@sunet.se
     nrpe_group: streams
-'^internal-dco-test-satosa-1.streams.sunet.se$':
-  sunet::dockerhost2:
-  sunet::satosa:
-    satosa_tag: 8.4.0
-    dehydrated_name: idp-proxy-test.streams.sunet.se
-  sunet::otel::alloy:
-    otel_receiver: monitor-test.streams.sunet.se
diff --git a/internal-dco-test-satosa-1.streams.sunet.se/README b/internal-dco-test-satosa-1.streams.sunet.se/README
deleted file mode 120000
index 59a23c4..0000000
--- a/internal-dco-test-satosa-1.streams.sunet.se/README
+++ /dev/null
@@ -1 +0,0 @@
-../README
\ No newline at end of file
diff --git a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.eyaml b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.eyaml
deleted file mode 100644
index 1064ae1..0000000
--- a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.eyaml
+++ /dev/null
@@ -1,276 +0,0 @@
----
-satosa_state_encryption_key: ENC[PKCS7,MIIDDwYJKoZIhvcNAQcDoIIDADCCAvwCAQAxggKXMIICkwIBADB7MGMxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNDAyBgNVBAMMK2ludGVybmFsLWRjby10ZXN0LXNhdG9zYS0xLnN0cmVhbXMuc3VuZXQuc2UCFCAXLw3yIQHdSU+3nPNeeeVijdjlMA0GCSqGSIb3DQEBAQUABIICADkNhVMGbKvpc37pfFXgfJABOP8G2+++TFY8fhMfqJ5oOm7NsFNhVxjNhkswvWjP2m2ZG83qL381SVH3a6+mGylD2Jt9fOacEnR8A3/hqbabkll+Ss0MGhQzMyy5lrTbbWACUhuGyyqItPL/6Sq7J1PoeCJtIWNBDd4wsEmdezHPPUrhIlKBxMQxtrOlFTKrDMxaTHXi7gXAU80xsGaPZD1JhCUpMBhxOea8GaL23Pk93kdhIXdJf+2OKTZ06MHnutQ9I1KKzrlwJOgrVdvCT/vfAcH1B1kUQBdb0IdDpI2ai5onOfiV3VzySjOwTbUNecWWWL1Qgj0JelE5s6QAqNrao8jr74aQuheRuzxXMjx5r812HBqdByajKrhLoN7fey1dinrn6kA3QNT95jfe+qBj4zeYGNMuanSoT0xDoSeaNXMOJgPeSGXE4CijCYMk7k9kYPk8Gks5UXHXzqRUTlmROpiW+HaNrKkVulHmAPROb+GwHAD0bdZq82IZDZhnhtyXQeslIpbEAYjDimYhWOCoOuEinYFivwuwEMhz6q2KKy/xc+Fa/UIlxlYP1SsdTLb8nXLPhalFRPmIEumgkSuaKv0PJ+mGTWr9mQvL9DTLo5oHn3b9tq5nVzTTYh7KE5LDL4w46ydcfFGHPYx0s5oJBg907rmKO1IU/brMnQcVMFwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEPLzq+juS8HuP3D5ZXcPafSAMHJUWLdmLCRhJ/AMfCN2GWjqhCXPoTOBHzaqdOYS2OGsMlTsHtVnOsoQX1V4Aemk2g==]
-satosa_user_id_hash_salt:  ENC[PKCS7,MIIDDwYJKoZIhvcNAQcDoIIDADCCAvwCAQAxggKXMIICkwIBADB7MGMxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNDAyBgNVBAMMK2ludGVybmFsLWRjby10ZXN0LXNhdG9zYS0xLnN0cmVhbXMuc3VuZXQuc2UCFCAXLw3yIQHdSU+3nPNeeeVijdjlMA0GCSqGSIb3DQEBAQUABIICAGbkVbQuYf08MqanehaI9uaT/e7fm+ENaPR1rRcUen0m0oqnDwN+KZiNtZJsH3xgJsQ1yR8lNJOjWhy8YzVnzHSVn6UY3/oN7ZaUxcoMkXFTaLWIRU+AZafPt6gZi9VdClKTRJhSobd4RmRk8NOJQe1hYrUpvVnXtOqwucdUQZh3Si7eXT72yDmCcwXe1U5UT+0i97bXjESXaffAPtDKgW2LsRHudiZWy0aFqnr9iL8ykj9uB67GDmit9it9U7j+kZ3N/NBDOX+w+alCQ+NKAi+W7I9ORdSzEnCP6I6+eXa21uMbOrQAnR1qs9fgzvLs5WpEoKf1BuBg+83RoSj5EoNbF8BG8S9Gv7WGvTl3bd88TwUGqffKk8pQT/qM6+zgtlZB5lBEktjkZ2W15OpBC3KUaXXk1txOSV1UibC2/DS83wKZ+/6JcTNA2zliN84Bs6YSrL5f8W0VtiLYH5CZ8DK9wm9L6KEIYaHdq7KYw5G/+UY4lPM93GwEzsQcLRlS7awDbDXLGyptQMPvTN38UYJUKDXbbXStRiUDx578VjB82KeEkfXX0jLWWzsRTBJ9PDVEOj182OPyV42cyNhcLApoGCaBHDaCXtblqwrAZyvCP9G0I5jllNqka6CF8Wg0eFSS3PEGRjTDtHqDDxvEIxOWjZOXzNhrxJWCxM7H8tRrMFwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEJrw39Qr5gY+wcAXNft6l2mAMBvDdScV5FtEpqxNXr/rB2ssdF9Nplpn9KmTcQ+DQpQc08KpmdhM3r0sm32MHaqgaQ==]
-satosa_backend_key: >
-  ENC[PKCS7,MIIPswYJKoZIhvcNAQcDoIIPpDCCD6ACAQAxggKXMIICkwIBAD
-  B7MGMxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRV
-  lBTUwxNDAyBgNVBAMMK2ludGVybmFsLWRjby10ZXN0LXNhdG9zYS0xLnN0cm
-  VhbXMuc3VuZXQuc2UCFCAXLw3yIQHdSU+3nPNeeeVijdjlMA0GCSqGSIb3DQ
-  EBAQUABIICAC+KhokQN0Gf3+B3uwFjJQJwV4218H40S1oScXCErWC/DcDObI
-  eGrb/JTZn/+kaxAsVDNCGh/58QCAlPkfYrjgH6DYCA1FnaA/uBPlz+A7oFVL
-  MBmHMTaNPiP7sYwcdVT7iic3dsEWcv6sZXlTS8NK71MKC7k0NRIOY2oTc8K/
-  n5BKZX0tN3Soi0OyP7HycVGL2PV105nGGoVrUx492KTDzWgRGPd5ScJGZCDi
-  hUyXTPybDaWbdH7n3g7dtjbvrhn+o5dMBYLZ4j12+Q9wR5IyT+qUXYP+2p6R
-  /xQSQV/xp8qjZe7Npyif7spPHaVKnOKQzZb64fkkWDGoluBIWt6Ep96FPJ5q
-  Hb4Qgv+TH5QH4yigzBgSB4vOAD3zn0OwJ2/jpFFCMT9vSMpY6j5/2JTIX8RT
-  St5iUeVWF2rr2bEz2VpeaBeUHXHk0iav0/9iH6jV/VRUH6tCHMO5ku6/8biX
-  kyU9kFhm46f/BH3TbHgumdwI38yUcEUGL8Kl0wEUuZbnVOeLuImS8n/9Zc+l
-  lwgvvytN640Np+Rt8WaUGcuYqN0aZNL0sIeKSZT+FkXiDy9aqT/UUnEJBj4w
-  cSH7El54wD83+k1nWOZnjby2eVZ3S4QdNXzGKUr8wE5nYvUsRq5ZftmVPSVI
-  Ve27MLQSJuNwlVXzknD4sgX2k38ljXuvMDMIIM/gYJKoZIhvcNAQcBMB0GCW
-  CGSAFlAwQBKgQQmTzfx9BmY3+597sUuwsLzoCCDNAFBPwzXYERBGYni5GbRo
-  mk1cKBC6pdSpN24xCOgFbSipc8+rk+ShxgI33AB7SMdZYoq7wd2EkuQ7328Q
-  EytB8fBx9TxwvbHI2krOb1JvxBlRMsnYj5Robwa9Tp8zedViF7l2CRUqj9qv
-  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
-  pj6Drz8yamuQoJ62cU00ia0XTOgKVDHBmwQGznMuF2xzYfRd8CrXrNLplSB6
-  b3TA4gU3KtyGq7ldN70pT0b9xHyaCQqbK0izTwq1oGbg9dPTcJEDhMP36kCt
-  0k5C/didg4H8s6TI48XEy5T/7KItG+LXl/5iswUyX5H/iWeJw4TP6iERuj7r
-  5YH7o9QNVXIHcRwGty0lT9OetwcYyhUJpWFs4SplpP0f0YOR74SsLoG2wmC9
-  vzQB4Dx59B0RP06uAHgQWHVFl0VPXnWDEHpWJNuFEZrD0148uXl0H2d1web5
-  3AU8B9dzXmisNSc727UvZkIXLYtZ1cljF9W7wYGyG09iSo2OnhXz8Kj77IRv
-  hOH1SuR/Nsb2zmrMtjzGAJ/T4B7EHfrIrQt26eRFo2zfI+rlwWYXX0cK2+QI
-  llrLokmTb7J4ZwcoqItS/9u8YHe7Y3kotFB5FcuM23HXbn6/XL+xfgCyK0o4
-  h2CoX98Vdo+LrqmtzKYMxX0UpbmuLw1Gg0afBSfH5E1qRtO4qT+a8NV655Yp
-  UVP+/ukcskMQ6nqYBQ1Xm8kZhtQjwPDXw4Z95OGtK5MXZUc488BjXbYJVi23
-  K0PMG4PJbC8Xb0SWjlv9eFfKoOvhjBG8lowMaEVXgD67qesAxhxKe8Rw+qZF
-  qbLpdnb8g38uUNm3AkZbeH0XVclAHOLVACSqEvt/swPzq5y9SXAvpkHijiKS
-  wnDu8TiofYVX/a0lzpY48hqmUnxsA9tA/lC694lBTa9DjTx3MUCIuYDhJooq
-  vBxs8jiZ4TMt97BKVDFPtEof5JfD9gM+n4]
-satosa_frontend_key: >
-  ENC[PKCS7,MIIPswYJKoZIhvcNAQcDoIIPpDCCD6ACAQAxggKXMIICkwIBAD
-  B7MGMxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRV
-  lBTUwxNDAyBgNVBAMMK2ludGVybmFsLWRjby10ZXN0LXNhdG9zYS0xLnN0cm
-  VhbXMuc3VuZXQuc2UCFCAXLw3yIQHdSU+3nPNeeeVijdjlMA0GCSqGSIb3DQ
-  EBAQUABIICAHMDMMV1aGBY8xfTE8S9ozVydty+JfNMymWjtMdKitaI3h8NSJ
-  ZL3sstOLv0Vv/bDTfA0NNwEWYwSCRtzMhNw+zXIdo0gJLIgfO6ChqA7jaI/C
-  O7f4ixH0MEh84gtWodIXB6aGyylcznHPMy7PqXjhR7/+qYKGIZvzhOXxhAMu
-  ycl2xvqyeaB7wad5lvJRoRYBW1JxFbIFnBBgK4ljtyeyDCF67O9h6CR063ye
-  pz8GmuA0jWBFtAeV/PdNOTG+BcpGI9pnS77VDG4+UUqwaWt1JLrSOnKAjPL+
-  QpKnFgHzMm5wfuf2pRlULhPPX5izTDNg72xbyWr3Qm3wX9TNm/dp022Wqb3S
-  3JDVUDbG+l4IlYlJBfTmI3VRx10ifuw7ld8ezT22WJeJuZZ/YAF0LCYvP+tk
-  eE+uvIdNkV6QLdQv+3UTNxA9sfexlfHr4HeliAR57Wv2EWkES0Kh8yfPMLql
-  ASkp3rVNvD7RwGZcLqBlaJmDd+6OaDphEamPkCuazFRBceRTgTwoC7JtYQv4
-  4GBA+ppoxr4czyZ9pLt9KLWZf66FFCZaJjmTx2LY+ry/0E2jWo1GAgQV4wzr
-  Ja1u5gqc+JyqTYFb7m6OyqSnqSof9NaHMYjFCMre+O8xZaG5z2pok3OCAT8A
-  Bimog0w318C8oLro1xyDnBLjsDAlG1/RFEMIIM/gYJKoZIhvcNAQcBMB0GCW
-  CGSAFlAwQBKgQQqZjHuMwYZg76OS9FkMCNcYCCDNBVg0S7bbDvb6E4r0sQcz
-  d3lILZ24RwxfI2n74sbc9Zu2J4ZNaw2MJuUIYDhRal8LzRNB5iSXbUY1e+kC
-  T2sjhEVj14DMqPHIl/S2QtrQ4g2OcEvp8xMG6bgUWG0rq7xkISPHXWdVnu4H
-  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
-  MFxJx7z4WhD7m3gM0qDjJChmzH7PxrThJ7]
-satosa_metadata_key: >
-  ENC[PKCS7,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
-  BPaVuTb+PakUtIZp+6mq0ycXfo+mS4aVrO]
diff --git a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml
deleted file mode 100644
index c348928..0000000
--- a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/hiera/data/local.yaml
+++ /dev/null
@@ -1,132 +0,0 @@
-satosa_config:
-   internal_attributes: "/etc/satosa/internal_attributes.yaml"
-   saml2_backend: "/etc/satosa/plugins/saml2_backend.yaml"
-   saml2_frontend: "/etc/satosa/plugins/saml2_frontend.yaml"
- 
-internal_attributes:
-   attributes:
-      displayname:
-        saml: [displayName]
-      edupersonprincipalname:
-        saml: [eduPersonPrincipalName]
-      mail:
-        saml: [email, emailAddress, mail]
-      name:
-        saml: [cn]
-      surname:
-        saml: [sn, surname]
-      edupersonscopedaffiliation:
-        saml: [eduPersonScopedAffiliation]
-      subject-id:
-        saml: [subject-id]
- 
-satosa_proxy_conf:
-   BASE: https://idp-proxy-test.streams.sunet.se
-   INTERNAL_ATTRIBUTES: "internal_attributes.yaml"
-   BACKEND_MODULES:
-      - "plugins/saml2_backend.yaml"
-   FRONTEND_MODULES:
-      - "plugins/saml2_frontend.yaml"
-   LOGGING:
-     version: 1
-     formatters:
-        default:
-           format: "%(asctime)s [%(process)d] [%(levelname)s] %(message)s"
-     handlers:
-        console:
-           class: logging.StreamHandler
-           level: DEBUG
-           formatter: default
-           stream: ext://sys.stdout
-     loggers:
-        satosa:
-           level: DEBUG
-           handlers: [console]
-        saml2:
-           level: DEBUG
-           handlers: [console]
-saml2_backend:
-  config:
-    sp_config:
-      organization:
-        display_name: SUNET Streams
-        name: SUNET Streams
-        url: https://sunet.se
-      contact_person:
-      - contact_type: technical
-        email_address: noc@sunet.se
-        given_name: Technical
-      - contact_type: support
-        email_address: noc@sunet.se
-        given_name: Support
-      key_file: backend.key
-      cert_file: backend.crt
-      encryption_keypairs:
-        - { key_file: backend.key, cert_file: backend.crt }
-      allow_unknown_attributes: true
-      metadata:
-        mdq:
-         - url: https://mds.swamid.se/
-           cert: md-signer2.crt
-      entityid: https://idp-proxy-test.streams.sunet.se/sp
-      service:
-        sp:
-          name_id_format: ['urn:oasis:names:tc:SAML:2.0:nameid-format:transient']
-          allow_unsolicited: true
-          endpoints:
-            assertion_consumer_service:
-              - [<base_url>/<name>/acs/post, 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']
-              - [<base_url>/<name>/acs/redirect, 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']
-            discovery_response:
-              - [<base_url>/<name>/disco, 'urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol']
-          want_response_signed: False
-          want_assertions_signed: False
-          want_assertions_or_response_signed: True
-      xmlsec_binary: /usr/bin/xmlsec1
-    disco_srv: https://service.seamlessaccess.org/ds
-    attribute_profile: saml
-  module: satosa.backends.saml2.SAMLBackend
-  name: Saml2SP
-  plugin: BackendModulePlugin
-saml2_frontend:
-  name: Saml2IDP
-  config:
-    entityid_endpoint: true
-    endpoints:
-      single_sign_on_service:
-        urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST: <name>/sso/post
-        urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect: <name>/sso/redirect
-    idp_config:
-      organization:
-        display_name: SWAMID
-        name: SWAMID
-        url: https://sunet.se
-      contact_person:
-      - contact_type: technical
-        email_address: noc@sunet.se
-        given_name: Technical
-      - contact_type: support
-        email_address: noc@sunet.se
-        given_name: Support
-      key_file: frontend.key
-      cert_file: frontend.crt
-      metadata:
-        local:
-          - metadata/sp_metadata.xml
-      entityid: https://idp-proxy-test.streams.sunet.se/idp
-      service:
-        idp:
-          endpoints:
-            single_sign_on_service: []
-          name: SWAMID
-          name_id_format: ['urn:oasis:names:tc:SAML:2.0:nameid-format:transient']
-          policy:
-            default:
-              attribute_restrictions: null
-              fail_on_missing_requested: false
-              lifetime: {minutes: 15}
-              name_form: urn:oasis:names:tc:SAML:2.0:attrname-format:uri
-      xmlsec_binary: /usr/bin/xmlsec1
-    attribute_profile: saml
-  module: satosa.frontends.saml2.SAMLFrontend
-  plugin: FrontendModulePlugin
diff --git a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/backend.crt b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/backend.crt
deleted file mode 100644
index 35156f9..0000000
--- a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/backend.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFEzCCAvugAwIBAgIUTaCDhLxXSpF1wANPm3Bvhnx3gfEwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOc2F0b3NhX2JhY2tlbmQwHhcNMjQxMDE1MDk1OTM2WhcN
-MzQxMDEzMDk1OTM2WjAZMRcwFQYDVQQDDA5zYXRvc2FfYmFja2VuZDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO0c/tijd0cpBSsxE4U3OOAvJYGaNYmZ
-nU57TPqAbixJzwdK32RNiQOfIxxLGInb7Zy6HDwTXU3w/SdNR+p5V2Yg03312F9Y
-04DqojlqXu1nV8mSHknverLJ6kbM5HSjZR4nbYSO6PCJeLdgfvH36BIdUFn7+/aH
-Vwz/WG0QWg0v8BSagkEGKur+EEEvccg2viG2yYFmRlRxsfnYxLP+EMfJqw8D0G6Z
-He/3JSwQGfQ+Ix514KQZnk8T0fnrUbuivB8ig/McKJTl5M5x0QwWWAC7Zc6lYCiD
-ugByIvIpTPGGpf9W+dGCfupkmMFOpqcqYL2Q0CkEUkli93vFEh2XGNngtvWkz/6Y
-ZYKkf9C8Jes5bM1hafd2xpfErZy1NVr2rYK/pwm16KuT/KJRcPZiNbiWwfiAiAyf
-ieI60U4qenwzjvOME2Xy+YYtfcl3tgJ86ck6xQHJ309iOcxoLiJPI5VvM0KJyHfe
-OUgS07T4E/36/U2Tgjjnu14ENFl3LmK45oL3XV4ohwwk3xt3TU+5RkaXmqvBsSRs
-1xaJtqE1KURFYxNoN78a7gZFL7RgmGelycd9aOfZ/gTGYpQYIqdfS/Dk/SV3wfTx
-lzbNhNfoDRFpP1CNdK4Jk3lGYOIpFVOXvwIKEdgo1S7PaAztylpiv+Y0FlMhzk28
-HaizSVi7j9yjAgMBAAGjUzBRMB0GA1UdDgQWBBTnTgYLAGQwTGULoMdXYFcI/ZFF
-MTAfBgNVHSMEGDAWgBTnTgYLAGQwTGULoMdXYFcI/ZFFMTAPBgNVHRMBAf8EBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQDUlVSTQMtPK/gF/UNEpwWcH+RDKgQrFg8k
-6fwNh0eK3obeDHOgVxDi13yA91PcQQRrcrxQOl9DGZV8dd8BP/rnByKqLfWiatqX
-JWe39uuF7bPUWQuLvWl8+KzeP38ccWxiF0A/ukHNHCltVqk5vSzRQnIMcaqBk5Kb
-JlYAAKvJa9XlJhTh2wJnl7Ha9nRyjydPXJOeL84NIRLFKrAVf7zJqI6cHd/UilLd
-/FPSQJj9G91Hi8+ZONLVj/DTse1LrqD/ubef/SSvKJ6TTw8/1RM/DsXDVyBvnO8y
-TtDpfio/tfgV0Ylyrsdz+KYNquPdvOuvWbOcBYHoPXX9XEtFLOp/YpmNwSlWc33I
-6vD6/whjhHHrHLeclqNIkVNmT8MIrLx4yBda6+TIF/Wf97nmjMNNsFvQXzDR2MyL
-LvvLNXuMtSilXPrPKOuYbixGZVjPrLbjsG4q4MlEagFIpBWztu5GPmMCq6o6FU3Z
-OhDf3ryAy5vYDb7uK1smDh7Bn68PwMBRU9FzBHdc+x20Gj6CvIs/wIvKUMB2a5Be
-mHKF6P2Nsm5ZKUC7IfxqgD3SyUQtUytWWdrr3kFx0d3p9taedMFvA05McT6iCyyS
-o1QvxNpRJoSeSVNg7Yr/U9ig8LcVJgYWZmNcOJOEAsDm02LbsG71XRl+yWZ8s8Xk
-yBHFVxirSw==
------END CERTIFICATE-----
diff --git a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/frontend.crt b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/frontend.crt
deleted file mode 100644
index fa8c25e..0000000
--- a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/frontend.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFTCCAv2gAwIBAgIUQQi+ztLdnsW/AYcONPVfFCrEysYwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTI0MTAxNTA5NTkzN1oX
-DTM0MTAxMzA5NTkzN1owGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt9ypN9KZb4HKsvx1ak1eI/2CgiLm
-ncqT+SBBu0ed2XjlmqCOfby4twiIPEH50qII3euGkbded/eVcz1nxw2ECiNyg9Vf
-DkyR7gaKYDMbJ8o8gOAfyVbv1cK5GNDmHGhiSKI5/Nb6Z4BFkqV/EOgPNkNsYlfA
-GyxWmK4UaeZelsuyAW+g0b4mu28nlcjqLb1pDp6jBKGNQkYpEWFiKFRvJcjSy2mx
-c5u+j0Z6FfyONbWl5Oggj30Pq5tdgbSYWsL1O4j0ro9ZJ/IYxlYukZdRu8yrwQax
-IyXOIdTMynkpSlO7e+48tWQ3AXVk8e/HcInczd8RkyvwDOH9+8ZfqR7cnR+HWkg7
-qK3A/Z1hGR6nTx9iVylBPGi/QSRpX+FBhyiQnzsNLEJh9VytzEn4xI+b6DaBMJej
-+twu7qfBOOpPGGO9DBOwxtynUtUWmaVSS5lz0nxMGTQh6K9XWCet4+rPNmfz5hVg
-tGylAbW3cgyTd6/5xDDBHXLXUsqXQF7LqF1X7UA5iyIMzrI/t9Y1NL0bnx5RLr2T
-oRD2CHaWIyRKg2qvLKqoFWKWb8umPPDSTZz4vwaxG0EOpjoBOkGyETYnEII/a8bR
-z5ZXzZWFtRyda0lgj/dciMbEJONKmAT/s2UvBKbg3xnuwmMFfxMYVU94UvjyOgkY
-yWoW5F9F4lALR4kCAwEAAaNTMFEwHQYDVR0OBBYEFCl4xiVuDvZPoSWb5eq3dSSz
-fXlIMB8GA1UdIwQYMBaAFCl4xiVuDvZPoSWb5eq3dSSzfXlIMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGSG6nM1qI7tTlinO7CbMuqP8xvR9V07
-GnFWet0NvSIlcHLTOdjF1KBEb/qFdLScuvhkOUpKvXGE5vepdngEyyV+U7G6Z2X8
-5PF3Q4Pkq7cP4B2hckMar9kZ1KcisFYWVN5R5gX9R9L+J9Cm87jXPbUjyLhIBc1g
-HwXUWbdRpTJA/Sbk2Zy+AJzkNBSYptniNFN8T/dcZ4p5sOJxLSxQELeLd68sZoAT
-0i9VYdf+EPNGrNIgmAOTuQAOFUsiDC6I3IjRjoo1OL16tCZ25RZaCpEF2AmB3zxX
-YAkdKdXS9vQFfl+amcwnkaIUnYLGsdPkr1ChMsLcHTNjBA2APoSbQ95yk6N5flYo
-VTWKuJGJ2uVtEvs0LW3RcmTjkfFrO+ycXdXXSaQqpV8Ushxr6AhWHmv+920XH13A
-PSgqzSN+wCQ1WZ2DurZrlkyAoYxC0pMQZSpPVJwdKbGJs5whzX7Bl/usS+e08K+t
-Ns4axXvWoDJpbTElnPJHJyhF19NrJidxQjWxkO9MEyTuvAW1aUYjNyJYwy0hLm/N
-VT9ipTWdNY6sdDCiI4qP7c5y3QAR925bAply6t1bg+CKEOYvwTmeXDW+txL+39FJ
-a+pe+V+dDLQJtpvZbAa52Ytfu44nai7/0EXdN9gYjnj2er9dMRTqJNCI7cnrshIz
-2HcJfHlcsz+R
------END CERTIFICATE-----
diff --git a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/metadata.crt b/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/metadata.crt
deleted file mode 100644
index b5c13b2..0000000
--- a/internal-dco-test-satosa-1.streams.sunet.se/overlay/etc/satosa/metadata.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFTCCAv2gAwIBAgIUCnlGWo1dMvQgjyPIqnebnihqLHwwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMB4XDTI0MTAxNTA5NTkzOFoX
-DTM0MTAxMzA5NTkzOFowGjEYMBYGA1UEAwwPc2F0b3NhX21ldGFkYXRhMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoOBjfagxmFq/Dt2G1uPosjYxcste
-2CZ+zpHXYD3U4Xrkkz9EjBwoUnINwn0SO8ClmkhRA19L6uJrojC4yh+Dgr/X0LUt
-GGVvEda7Oaqr3Bu+hgtzRUSv6KDOUelQNMcjpJqDWoRQHW+RSxQXw7cZzYgzFjai
-9QM5eGWy/gucNnlCps/CtWCKp178+aa5LbRKEus6MtnJO+r0BKrUKpgjfbAjsD5U
-csWHMXgctqQKmlsI3j5zn2ZGk4K5e56CWbom2WjL0zkYuXrrnDd7AAReczWpFwrX
-JrdqYmxyileyKDer8/TSZXSj26a1cRNMsZnnnbHK3m3R+8G+/CEHPfs6iQaS/7ML
-6PWDJoeZ9FD+IiSO6OA9KkskUrrLNsu+fbKc+IXb6OS8CKfnVMMOpUifIYOz9j1/
-3kz/p7VKzGGNuUaecY6JGx7Q992LgNUBTdWTzfjpsVANO7f5nhggLLDSD5wBEHUi
-4AuJh08gMFEnzliu9NXVrBnYw0suJOJzQOR4OIs/lX+lzlgYUPmpSwUzt6X+AbqW
-C12ThV3br0ROFdjRFA8WA6HmfZFqB4s1YIN5HbDlbbtA2MT36IeJUrY1TyWD0RMq
-35Dsr9VlWfL8Od/xw/AYj1bvm988ZWQ2onZGNhA/eBLdQ9s1LHxxtGURszFkQzhB
-eng0YgxVtI7ZafECAwEAAaNTMFEwHQYDVR0OBBYEFKPRpGuK7STmu3xWugRS5ozr
-NSu7MB8GA1UdIwQYMBaAFKPRpGuK7STmu3xWugRS5ozrNSu7MA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAFGAWOCe3+2ZHow5Jzz8IwyzTCH4i2Ue
-SVf22JrvMMNmAoQlmCx/PY7F0kVqFV4ercSCJqQYtGc/Ss7gVmZWAYwjR5TpHhZK
-NN/UejIhQfuX+gZbfP6FfZgrlQC1M4MA/dViW1F8CQ/81Nn7mdcrZafIm5QjSKmm
-zHABuYeiWokg49AJbty0tYjbejyDO1VZc9V9MNEu1KrsYMER7/87ZeCRr39vycSJ
-WYF41Nv2aoN0N17wzge7D8cBIlxbnZytEBmuEAhYiuj3MZuJjc1DsP1LZpKfQ2Ss
-SfLqh9giyebPloK9DsAQy9immw0Ai69Ss95H/JsXvy/kaNucxd9Gs7RBPjWejOzS
-UTZHbkgPwjaPign9KKfJMP1bY7v7aJuuCV0RmGEWQuc33GDpg4d7E0+mzh/77VyC
-9vE9ywkgUY1wqKqaH4+CAUK6X1dxLl6LJwDaN9/e7lm7mfQeRzMqOSqWWVy9y3Tb
-JOFNiqiNrnWYIo8x4bY9UJ2XJykc6/YepI9sauNKCAR3D8204uR7Ykd3ZBT5SI4W
-rRWf1Xvetdt281u8pl0zbXay2jf0VhpKlhcuuef/WU/S+HwqxAX6siq025gUpjAb
-Ha5Tbi8iFtH1b1yrNt9kZUEzTEC71N3u9U+5CsK4xIUwyWpC42U7qJIuoJUgXDrz
-ghSHOYFi7EkW
------END CERTIFICATE-----