diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index a1523e0..24c8b92 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -177,6 +177,7 @@ internal-sto3-prod-db-3.geteduroam.sunet.se:
    geteduroam::db:
 
 internal-sto1-prod-app-1.geteduroam.sunet.se:
+  sunet::fleetlock_client:
   sunet::dockerhost2:
   sunet::geteduroam:
     domain: geteduroam.se
@@ -193,6 +194,7 @@ internal-sto1-prod-app-1.geteduroam.sunet.se:
         - member
 
 internal-sto3-prod-app-3.geteduroam.sunet.se:
+  sunet::fleetlock_client:
   sunet::dockerhost2:
   sunet::geteduroam:
     domain: geteduroam.se
@@ -209,6 +211,7 @@ internal-sto3-prod-app-3.geteduroam.sunet.se:
         - member
 
 internal-dco-prod-app-2.geteduroam.sunet.se:
+  sunet::fleetlock_client:
   sunet::dockerhost2:
   sunet::geteduroam:
     domain: geteduroam.se
diff --git a/internal-dco-prod-app-2.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml b/internal-dco-prod-app-2.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
index 56eda2d..7d85d99 100644
--- a/internal-dco-prod-app-2.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
+++ b/internal-dco-prod-app-2.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
@@ -3,3 +3,12 @@ saml_metadata_key: ENC[PKCS7,MIIPswYJKoZIhvcNAQcDoIIPpDCCD6ACAQAxggKXMIICkwIBADB
 mariadb_user: geteduroam
 mariadb_user_password: ENC[PKCS7,MIIC/wYJKoZIhvcNAQcDoIIC8DCCAuwCAQAxggKXMIICkwIBADB7MGMxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNDAyBgNVBAMMK2ludGVybmFsLWRjby1wcm9kLWFwcC0yLmdldGVkdXJvYW0uc3VuZXQuc2UCFGB4eLUfU/lR+IEcqCllgBQuPSvRMA0GCSqGSIb3DQEBAQUABIICAGLFSXFECBsCj8bUcaBgC5DpqH8ziwVbLXNy9fjMyHbVO2z8VsNVjMQxHLXDEHElaDTfFItuZ49ZFB00qNDUHv5QAXZjQe16ANqWWzdKMxD6RJcg7ZavTfx6jktBf0wgB5kdmn8G0DURU1x9nSXOpha0nWFgnt1mK56JM1/ewNwrgfsrjSeRlYzDWDGSwHuGP6TAcHim/OeXS0dpG1SZxVhAt0L3e69hAHL+S5B4FY5j5TVtzpohBGwvzSD32Glt+U7hdcRuHTXG4GFVtRhRcY2tvPXJ6GsLswT15M14m3E5FRyUsb6160dd3DqLnWL4Hxud2mtJpBHlRo69si+hx9sbe6B/ayfy5UXjkVkFiWjAoVuTdPIQMCFLCV/V8XEeSRsfZq+g5K/K+5QPYoaivMW25aKzqm24RS6Kv5tefbQHsQRLDeTLJJWqsGsVW6CNV5YqP5osQUp+RJ6v0fLUfGo/IyitqbsDGhJer20ISW80dpKDBzw+X9Ppa3GgYKxX0uFQb4qnw6y7v/wtS8+6A2MxH53iNUIiitpJHU//QjxhoQg10Y3hDSxLXCxsoQjiUmLlPiqHxACI3jmhRuLYQ+BNv18w2All7/mTz92fIuKR7QqW2DAsez8U4i4ZZqGP4Choh/pI/R8GKy6+yAbbf8oM6dyilv9Xq4f5m/leGyMWMEwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEFmt26/9/2QODpPev6njjS+AIMnSDsBoXljrzTaVxRUeYVQx3++c+Nj6JWy+/oEGon9i]
 mariadb_database: geteduroam
+
+
+fleetlock_config:
+  geteduroam-prod-app:
+    server: https://fl-prod.knubbis.sunet.se
+    password: ENC[PKCS7,MIIC/wYJKoZIhvcNAQcDoIIC8DCCAuwCAQAxggKXMIICkwIBADB7MGMxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNDAyBgNVBAMMK2ludGVybmFsLWRjby1wcm9kLWFwcC0yLmdldGVkdXJvYW0uc3VuZXQuc2UCFGB4eLUfU/lR+IEcqCllgBQuPSvRMA0GCSqGSIb3DQEBAQUABIICALkkssU+H5fwFmCgGi2pk7wFn/vFB8ZpPe7GG2Ij/0H/WtMci38zlXLEfnevk9vuSZxDQfUhZS6O83wcKfhgTkSA0gvWqstXKfj1twhADbTNQ5DpJkeM31flJhWC5ay9YzZe71jtWH7wpDOz6ZteG/sYDnrpQshD+++cx/Fp8wx3gdH8Pox5LKHkJ3aUVzgm7CPaZCka/ULXR0lMwU+1TAYqZ8r5EejTEC3/hWMuwTq+oy35bxSSOfPF+JF8pJPgG6YkvYDfzTr+LVw77IQ9uqug+YsaZvZeStNkj8Of5kWXQQ2QAIuOEo+RLf3rpiiengSlkXvNhk6L5o6+9eUlHf8Vzsm7tJS1eLYQvkRzEkkd010zTv17NOTUdp0odGCeYRRj01zv7mmGcJrUB8P11lTgaYNB4L5qLpazz4cjRy2v442Di2ChpnZ9fRI55k6wld8pDjhMlgVT8RgcCd4MDaUm0sMzhEVoaV60qnyrDRIYN6LLa03EtVtqhpr0ZFOXbjcJxqmcfDoD1+2QdcRnbd73YcMNSK34dBe5G5EYPOKtYk0M0aFT4WTF7a/vr+ZCYwrnekcdEsccVUOgjkfKwlrpJZZq6Ooge5dTE6LbMWtiNy1PXYVd8PlweWciPB9esYX0r3ZkK26wPDo6VkVlQB+gOpCXBWsvRUNKgjIh1D3mMEwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEE6pcLWBtgIAMJ3+ZJVJic+AIIHZputf02pC2bltBPK/nE9PfA37j/cN19S1V5HXJ6MF]
+cosmos_fleetlock_config:
+  fleetlock_group: geteduroam-prod-app
+  fleetlock_healthcheck_timeout: 300
diff --git a/internal-sto1-prod-app-1.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml b/internal-sto1-prod-app-1.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
index bcdaf20..d4694f9 100644
--- a/internal-sto1-prod-app-1.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
+++ b/internal-sto1-prod-app-1.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
@@ -3,3 +3,11 @@ saml_metadata_key: ENC[PKCS7,MIIPtAYJKoZIhvcNAQcDoIIPpTCCD6ECAQAxggKYMIIClAIBADB
 mariadb_user: geteduroam
 mariadb_user_password: ENC[PKCS7,MIIDAAYJKoZIhvcNAQcDoIIC8TCCAu0CAQAxggKYMIIClAIBADB8MGQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNTAzBgNVBAMMLGludGVybmFsLXN0bzEtcHJvZC1hcHAtMS5nZXRlZHVyb2FtLnN1bmV0LnNlAhR+JCTsbmzESHQCNpmYcFp2u7LT3jANBgkqhkiG9w0BAQEFAASCAgAyCaes/Q0z6J1NrdCNoMsCRuy08Ls4xz2j9HvYPIAciXXg8W45H6Su7y0J53NF2H2moBbwWP4zgQAVw9saOdCQNl9CYTK7TIGsBLH7jt9vHHG4XDm0WeKWRQh3GDX9+RhwCbPl8jKELf3EWf0kvxWuN8vOX456vOFkmHlTIpbF5wuSSXGPLPE8qpMZD3+tTk7who96S95vhlbB7owxJc4o6Ot9WFueNniUvmwvhkuHW3G5AAgC8W2Lzw6B966AVmdnxSAb8J1qdWu1nSIPmQ7DddAA1XcCwF/GHC2NdPcbu0LRne4I1Rh4/LrGjCaa0QOH4UcxH1fqYuJjCy7Or9Z7shkFxhc7YJA71LvvzyE50KRuNRtZZurw+gNV4fTlGlyttO2oFMqX2tENmH4X5Ymac7spCvzoSzXsyoQG/rGrt1Mk043DF/25A0AP9bKaX3bukrqP40CL87Gk/4yaQS0r5sRcbPhwZrWoo1HP6557FhVIdyf00lX1EFbtKJcpuTTNeOxrowHhqQ7WNVqGord1PceVKiWGe3SOMn4OWt8lnQK/CC+St19bqavo3S49ILQt25JGUrUmzvyXakTKBWu+C1rjzt7mMcW6SpPXI9MdlATVEADhAVIXrTkYo4QrFAzGLgPqccwelhwu0tjm8m0bAeUOBU+Gzr3tlzYYFAVd6TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAnARh9cwPvySr9H0ulf7nLgCAERePSQjX/V22MeeSRExKf99/Jg8Q1OhQvZ0t+tVJoYQ==]
 mariadb_database: geteduroam
+
+fleetlock_config:
+  geteduroam-prod-app:
+    server: https://fl-prod.knubbis.sunet.se
+    password: ENC[PKCS7,MIIDAAYJKoZIhvcNAQcDoIIC8TCCAu0CAQAxggKYMIIClAIBADB8MGQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNTAzBgNVBAMMLGludGVybmFsLXN0bzEtcHJvZC1hcHAtMS5nZXRlZHVyb2FtLnN1bmV0LnNlAhR+JCTsbmzESHQCNpmYcFp2u7LT3jANBgkqhkiG9w0BAQEFAASCAgBuszLiq0gj3QiGumED+7SiT9zUoWD3fMwipkhbLzUhKmJK+cNIeUFSV1YHg5ZXrhnXZY77qt6HPv4SCW2ul9MMt0xn++C2/L9FmbfkJXea4HlD7FRKCfiaUwGJVwu3WZneMQpZbHjZ4IK7Ti4VLja03tMpJjXGyaTVh0EiTcJzMeg6bKPHhq1ZyqXO3LmtLfwNs/H9SSrOtYaIG5YuqE6E3N9QTlO7I9x1Jac328t6PIkJnXMUefl3Unb+LKeBZJ8WgvMn8BsU5XELkAp9sg6rVzcRyaBJ6sXyeK7UDGHJwJ1fxXFGgtLdSDlW8NmmTH4p6rfI2pqh6zcnjc4hIiOIx8Dc1vFWT+9AWODH4HoRAFb1S8OJG1rklNmycjR/vA9EBsW1oJ5eYXDEtUHMWOLeIBnyGG3xo7SaS7vSn0KV3/6BKHqG8yf8Rvu98Qehd0LuuP6i0K9k2aELoJOOhe6YVcbJFyFQpBoJUqXiOr7gvOR1HrEXoYQM0bQghH+EL52lRctcyQo7M9WjjqnxefvfzD0sekMsO7RB12Fd5zmqWccT3o3Sr9AIScq47C2RzjV0UdcTlX3KGVuzd2cZTHmrNoG0K+zApZ7RlU9J4dsEecFsH8S4NMOBW3/l6BXiavT7YCTuFpiUmWI07plubKwHAaJAqrxN7rodsZo1V+X5ODBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6Nwg27JvaQGjJ5oRAcskWgCD/JK1TfUWAcfWM7FdscaMqY2HU+HKBFtNWj55XVvgoaA==]
+cosmos_fleetlock_config:
+  fleetlock_group: geteduroam-prod-app
+  fleetlock_healthcheck_timeout: 300
diff --git a/internal-sto3-prod-app-3.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml b/internal-sto3-prod-app-3.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
index 508fd7d..703c823 100644
--- a/internal-sto3-prod-app-3.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
+++ b/internal-sto3-prod-app-3.geteduroam.sunet.se/overlay/etc/hiera/data/local.eyaml
@@ -3,3 +3,11 @@ saml_metadata_key: ENC[PKCS7,MIIPtAYJKoZIhvcNAQcDoIIPpTCCD6ECAQAxggKYMIIClAIBADB
 mariadb_user: geteduroam
 mariadb_user_password: ENC[PKCS7,MIIDAAYJKoZIhvcNAQcDoIIC8TCCAu0CAQAxggKYMIIClAIBADB8MGQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNTAzBgNVBAMMLGludGVybmFsLXN0bzMtcHJvZC1hcHAtMy5nZXRlZHVyb2FtLnN1bmV0LnNlAhRG151/aViOhnzRCNITM1xaffPM0jANBgkqhkiG9w0BAQEFAASCAgBi4px4o8NqIFjNyAgyNRdSH6W0vDSo87uMAg/N7MBIDFvDfQadipCGlv+9uzVUhZEgOqa5snP2WOsc75u+PK/9TQ6qgB/WXXcx/MXn8E5HDKHHN2DOX1P54c42aCviORI0oX8E5MWrRWXFxxT/Rr1n5TzAcUsBq2fGNKKlnjHGGvX029BluHkneT33rccaYc4c0/fUxuJL0LFjNfyIafcGelvQPMKebA3eCRYLPPg9mc0z+Ga4v6buCEksu5apCqybaWGULt0WBqbX7CKEQCdQrj9iGFyQjKNDEH+ve12iENht8KkSbhR2/G9IV9Ib4JEzT2WobHCeQ3fbUNeM+DQXktRN6NQ85JAbTvNQSJNeAC/kB2o9rhr9E6Vy9B7AEdLcCR36e0B8J6/c8/pp80mGYSghCi7U0hfF/9mZki3cgdubkV/TguCRIXSYZIO8rECa8TRTDLMhEHy9o8VJAh5xQtCQCz+u4dbNZy+yo+OxsfAhJF+h5V7gcCdSbB9XcFqQ755P/ycL4sOm2vMEB5J6Hr0met6JsZgVG+o4m1+DpXbUis5lEG+cqY0zTsYrNhR3byn1HpqjsIb2k4WP7dR3HG66cMg76eLqAM20zGnmzYWJv/rL+FzLgVY27y+46+io5HjgYn6BLBKaaUU6IK1oiAkfmBedjwbsuLTVpAJOzTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIJY2TcXvyyVl5leF60nWvgCBVnULO4xgMQj5uNjQEZBbqSkqtDw6vOSdzGWfOO2f3xA==]
 mariadb_database: geteduroam
+
+fleetlock_config:
+  geteduroam-prod-app:
+    server: https://fl-prod.knubbis.sunet.se
+    password: ENC[PKCS7,MIIDAAYJKoZIhvcNAQcDoIIC8TCCAu0CAQAxggKYMIIClAIBADB8MGQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxNTAzBgNVBAMMLGludGVybmFsLXN0bzMtcHJvZC1hcHAtMy5nZXRlZHVyb2FtLnN1bmV0LnNlAhRG151/aViOhnzRCNITM1xaffPM0jANBgkqhkiG9w0BAQEFAASCAgA895SL46mvCR2DXwTO5EaUleVNtggBMB4Dr6mRY6x18sniSsxA44BFmLSRQKVfkTT80iTGj/45H89WrL034uCpfEups3YJR0jviTJtpus+erZwTyXX2gYqbLS0PGpn8OsIBVP4fHk6Cy8hwAdhlw1dVTgJnZnZ+ZSg0zGByEA8LAAGGIUMnuP55PGw4/vagMumihk5cBkB+OvSXzV/9DEWf8qtO/jraQDmqp+3/CfCWKss74Ei8iLh4Uc3rSzgaB8kCfsymvYfZ6HRs2012zJm4oO1nBwnMwUVOvPuhV0ilR66GqQX7aJPc06x/JT7xghcpfsZ4EKZiPHUjzfO4X+3FvexM7/SUABItR90s8qIlCbazVygLzQ4hGmwE1lfWo5P/HWdUVAGzQxHxu8A1E+qFy56mXqeF/9IAlJTyxR7WiL5DTuB2677x4gmU7sIhQr0LH9q2TVHH4sIIh9issZDQO/+P44SPXa/LQQgEn6POJNmA37+unimuegLeUfhcRTxeud3vHqy6FyUtBKdtm+Zsl1z3HqZ+PElMIGHFUoqwQAMROWxWjpaScyCXeSWc9C6RtDMhRTZo7j/gIWpUgr2D/b0NxI/WRmVu/SJEHc2JBdbqhi8zHyk2WldOtqFU8Es20E86ORjnlAD+eRpfzaryGd/iKbD2s+pWCsW5nyptzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCeQrs1NvBDJEgKLelCNZrtgCBVR3iizqvSV72TR48AymQuZ1ayo/v/4j4xy8rSXoEGYA==]
+cosmos_fleetlock_config:
+  fleetlock_group: geteduroam-prod-app
+  fleetlock_healthcheck_timeout: 300