diff --git a/eumd-2.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/eumd-2.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
deleted file mode 100644
index db12feec..00000000
--- a/eumd-2.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
+++ /dev/null
@@ -1,28 +0,0 @@
-STATUS=UPDATED
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMA/ni5nOCRnV1AQf8CmL02SoFvrAlqsks7MXhH5mX1ARXKj1MzufOu3hLH4Y9
-itfz/Kgc96CLh9ssDQ0F/L+Vfdx3lXbK9WFEsnJm5h3qjshr31HX50h3H8emCyAd
-SC7t+A22SyA4BfLq9ZOX3+fcfj4nsTmsEvDTgH92Rfg8dc5M7iG0ytNYG4s6Huxz
-wWK9LseHr9OPBA02aVqBYAEnWWDsQMBZudiHJf2HnvKcbnz2jz7bTBDAClBh1hIR
-xJYdU4zQ0a6d7JYn9Tw6hctFHqq+WPSuSRkzxPxf7/Z3ztdVzvKL4HNQjllxu2c1
-SA4ANK/CWYUyvXInfercrou214WoXFqPbq5yf8KQLtLpAZsuOlPl6uqn+p30NVtp
-wim+D04umHyDJbu7GZmSQUceQ+b4EDzUx1Tdy47rfaHQd/4zwSAQvGpCJ2v8cr3U
-VQUfFAz8mnkAkdywHenJocn7bfihyvYZL+krgFAUCfikdeZLEAyNQneJhN1udHmh
-8V4yyZXWfJKR0b2ln42EEqgmknNe/quYkUaEoih0L3otS+MraEeZQH9ix08zFLJQ
-QX+TQYedrgA0jZ7vVa29oNYxt2cEjh4gXcqtgSlqL25T4+rzyhDTDsBTtCFHs52+
-bZFM21xHr8qN1juiwAzv4sHbtaqEsi/Ua8iADoG4zk9ygvPV3Rb2Y2jNfFkR+Dvm
-ZE4Yc4nMgR9GygN17Er1jP+A43wRSUkRmrdVQo1g7dofOUrIiuyC2j2Fg8VhSH+s
-jGhrRvV37fDNIO6EWfsfyQgUdL4Rlo0sBFAZ8ltXtkceR+ssNjrXK6DwqSsB3hHO
-wEpC9FJLURcnjw/sQ6T3GfCWnp7tLQtr65rSuG1y8X2ti+arZE07Xaa1IwsdfKAz
-ISrBPM9Rzl/xVx7JB7Y8GibQ6WeTmZEe5jvfFSJDZxxYgRIN5BhQKiQd2OW5mGDc
-GQmja7PrLoPzneeUTLEdDT7TTQFiNZbNrC4glArZ9f97Cc+7dkSiwJLzvgGX7yQd
-qy4AOj0oYuvc9cRxLyS429fAF01shmbb+6KonKfoXjwgxWKs+yp4M1pxSMnEJzIn
-WcbxfOqBDIaibtqhgkplqT5W3NAPV1ltAJcwP5P5CG245bo0gCdfVmgP0TmjI77J
-B89kdLZSk6V4iBd39hFizs76RNIc4w48N7KuYCYQMNN0J2fGwfZMcSobjv7hgK31
-gZiBGisM1US40p/TvhgSZBWjs84Y/wuG3IAd8tix4tad4jYAi/asKrMlrgTFGDgg
-xoNGcEB1RiVdCjYJPISXCg+NhPzN+H7ZmoO2A3TmcedYAYlkns37rRwf
-=BZxq
------END PGP MESSAGE-----
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index c4e0819f..b6f44d7d 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -274,6 +274,7 @@ kvmmeta-fre-3.komreg.net:
             description: 'eid fre swedish metadata signer'
             cpus: '10'
             memory: '15360'
+            image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img'
          eumd-1.komreg.net:
             mac: '52:54:20:01:01:02'
             ip: '94.176.224.198'
@@ -448,6 +449,7 @@ monitor-tug-3.komreg.net:
 natmd-1.komreg.net:
    autoupdate:
    eid::dockerhost:
+      version: '5:20.10.8~3-0~ubuntu-bionic'
    metadatamgrs:
    konsulter:
    eidas_hsm_client:
diff --git a/natmd-1.komreg.net/overlay/etc/hiera/data/local.eyaml b/natmd-1.komreg.net/overlay/etc/hiera/data/local.eyaml
new file mode 100644
index 00000000..7ca4c4b2
--- /dev/null
+++ b/natmd-1.komreg.net/overlay/etc/hiera/data/local.eyaml
@@ -0,0 +1,29 @@
+
+
+pkcs11pin: ENC[PKCS7,MIIC0AYJKoZIhvcNAQcDoIICwTCCAr0CAQAxggJoMIICZAIBADBMMD8xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxEDAOBgNVBAMMB25hdG1kLTECCQDHN8NZrRCdqDANBgkqhkiG9w0BAQEFAASCAgBgM9Tmqx2z6uk8V8BopUQB3YqtalLOhGyqUKnLDbHz5A5zPkvoiUNr+gZMe0IaKd3LzyhvdLSpbxrEMQewY4tQLAVK1qX22/nTgE20hvihCAbtE9MFFNJtMP4Bo1Clfewa1c/nTKUB1EI0j6k2wEoUEgYW8CPLpfXryphLV6fUv/wCEJkE4+acIkSCS6AUQMGB+hs+ys6csySuBDj2Ddd5y+1/VB+T3IgdMTG+00CPax4T9F1hqvu3iDfXCAyw2ecIzln/NFlJJx70hUcWgWHTrWkn1s8ma/y0vUcUVUj22b7Ff5cnZVLJZfTCJehd8aQdsdIMqQTvOjpRqHlYruD+EwwpmqinOJF6rueEWWx8lOtnrgGhp3tHnwvNL11UK2QNLngFLvEtodGTZilx1FziQzpOBnbe3hjKiJwnAWPLeaQ/10s27RzuYmfB2pALKG5qLllRDCebD24YI+jHWFDAIglh+YJpjQzNLKYpQyBOuNjF2aOsBr/UtL9G8M6Uzq7jPZ35N014z2+FasLLB9lPqJZMilMtuAO8ixazziPdyeT+4K319MwT52/QOeyuIcImhjS7ze7O4mdawn2hO2nufhluWrFE7xWHPQOESMPtckPJ/ygzDuEFn1O7izah2WUKnME5fieVfi7kRikvCs1kZ/VHJ+YQ36SkOoeRP83F+jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMCnUdZJj9vM7LL9j3weBZgCCUXb6SOdeFViecOBVUTmwhbl+RMQHvGQwMJHtxv1MwLg==]
+publisher_ssh_privkey: >
+   ENC[PKCS7,MIIERAYJKoZIhvcNAQcDoIIENTCCBDECAQAxggJoMIICZAIBADBMMD8xCzAJ
+   BgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxEDAO
+   BgNVBAMMB25hdG1kLTECCQDHN8NZrRCdqDANBgkqhkiG9w0BAQEFAASCAgAX
+   W51kN6xtkMu/Y5i/JqpKlglu4Ot5qndIjUWyN6bYipdvwvpNRm8BnjU2uM3F
+   V7fefLAWrZYquNf89U9U+fM51/QJLU6nXtmC2aeKzVz9giW+GN2+UXb4zwUc
+   Bz79CGhcYl2NbhkJ447qUnLLpHmEiDQEnpScNw0ZcJueF07QRjAkoIzwdGX3
+   S9mq9WN3IP3IUzUJlFLFyg0KpizCK5WyMWIlL9prIb1gAWnNmLSIicp/owr/
+   C8buEuDFCGNKv0p5Tke+VrQqwhe922zfrcfiPZ5JPgbuscyzS1CrudeR0vUt
+   1Gkf9r7L3wiaJZRKP6OrLpEkwVdCBnOogH6bifKGnHik3J2prScs+7EGZIw3
+   ciRua1+myzhNhpP1yYtvdt6/V8uz6w//EtE4CUsofGCw5klMs6NgZVsHezz8
+   KTMdim3/9uSYpSWXXiqzC8IamsLBAeme7P73BWG4R+58Zm/SwoUTuIGDoxjS
+   EVkQDdkM4PVWvT4vgzgvTGwgQVGbszaKV5IFeHFdaZsQ/qNBe+C66znxpmlc
+   +YWpMi6RIrO8cTx0U3loDIloyfD4pBeXd5F/qLQ2h0BMyQm1iJPzF0C3uSjY
+   KeuRJsUPwxF+zn7/meaGpmfSljzaMT77vbrReQpMnkY7W0XHlQBHQzC1zrc2
+   0A6clMlThF+bHIwfmc+CPDCCAb4GCSqGSIb3DQEHATAdBglghkgBZQMEASoE
+   EHrwMqCObIQv+2AmBvh4xXeAggGQ1G+MBjLOb7MadRC9ah+a1Cqf4VXaPwCs
+   +veJE5vdKnj1NylZu9UWe0OfNDglkXahd+u0IWbkND0i0FMBVch0vJG74/5R
+   I+gPbKWZr8ji1o1A1P5hwpjy+Y74v6W8kLJ4bQu2kzYzUPOo4N7y0JmxdnlQ
+   6D1EdDuEYyeLKR4ZTNT3zud9CVQnGL/4edtawL23QLuZSevZKJLjfadoxTaT
+   KB/SFR03NNMUKuI6cVwN8mgVgeFh4gwWTDvuATsr2Dl5Dr38n8IEAYXwZuf9
+   7nKk1hh6btZ49HQEXDMdoj6+VZFciRbm0mnD+J4zs07iAqGdNrwRGAxxziyY
+   XIKyfOtIhpwdNUg/sETOA0ZTDfu/m68czr2DDY/2FMou0k1mDdKtSpeGlwE3
+   mAk82gGRb7vjiaI2xQlbs3rJnP0U+2R3qFdIEkgIF7ya+Msy4AGDmWAcYWdY
+   gZOF/+9bpGLAoMsk5oLi8cX04hiE9QSDMd2TPNKvjodz3a6rGGWQcxGYVhgV
+   sEPpGH4TzEkHX30R1ZO/CQ==]
diff --git a/natmd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/natmd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
deleted file mode 100644
index 5fae3399..00000000
--- a/natmd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
+++ /dev/null
@@ -1,28 +0,0 @@
-STATUS=UPDATED
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMA+07aEMyy8EWAQf8Dqz6ZZbdzV+QhunLyBRmxQi+EKzheMmHCx90Mk6rlz6u
-zlmHptrzgjeFso4oAmljyQUMrLK3vldkmaVdx9x7LKyTh2EinnZ7kndqn/FJp1a8
-SQ4bqkVG6E9dRgKUxC9vn/7C+KLgcM2PpOeYUuUXFBUlWyC3mWP6zsdAvhev/JSv
-DzFY/wPmmqV52QDb35TTmtp5aNpyNic1EMqR80MNrDtvliGRtO/iDsn3cOcDnyAt
-j/CW+gPz6jrAoktGLndyZgu8LbTzPrFmSqaI/gRHPWWMA+upBZV8zG7ZwqunI2T4
-uq09vD9J4SjLd9po5E4F7/aeABsr/jmqAxXCtfdWYdLpAagms3h+OaVP2j8nm+fM
-lkn2c1ZEzyLrkF4uTUuJap8R6eCoWXi2yL8bdaymMo0ohOvCX/WnaC9EjoQVTX60
-LAfg/yPp/IzzAb7ptfuxY6EMThQqyT26i4keAShaHr+SKOatmkyS23aW2Hb93biu
-AsfsA+1z6RJhlph013c/4akUOugNinzexaaBB0lvvhhQaM1+mhBbmQmSa925S8ao
-J4TCeugFrTwozwFX41IkyAxWk5PfAuUlzePVt8SEbxzAINWxeyNxHRyMpw1nhrr3
-QXiTxxXCkORICxpW7qYNgS4Hp0GnR+mfnS1AHdMcYG7VYSh+U2KJIb+JCrvWeoNV
-Pw4UC8ml+1bgznG93bGddswyYqKUV2bcBw7g5i/fJAyCfOCrWEimAfB4Md+dAr5V
-0OloY/LUBTRjSYLae1mRFwOHKe8TgWqy45bwdruTGcc9yru+cG5ULu6NYr9/A+wz
-N5TC4qPPhuMAONMmZkK9vEewWD8GdOX8LAKRDOjJaybDau/yQwiX0uYC0pSdm4ZN
-4nExER5KnyusErVh+yD6+XUFZNgvXoxhWMy1NlXmUUOtXcD9payz0lAB7XvhDI1n
-vqgM0vWCP7quhO+EWnnDPU/bg6onRx8sjqNG8/Dy3aTR4P+VofXw5udHeX++aqmg
-pEEpHJ9Q5kGcSsvJLL2vQd7AGtUhqvmOSToIGki9atts13ZdgnYHmgQID5h+/A1H
-8xasM8ez1bDHs3z26E1ZGbXEg6G77xVc5keBhtVX1uU+YCh6oo5KL9iiHL9DX4Uh
-6LPZ7yZbpUS7AVqHanciLzZDQOyuRAND29E4o1YJF2vnIKNlbNcsswfjvMyfATI9
-7PziZ2BYCK/IQdo1qwOlCmEmVI0o/RX6ZmTUCz13Ky2HcqViMbk23SXovYUj75UZ
-wUsvwDI40ltGo4KSil7zlh7bTL7zbTNvpducajDeXSBid/NS3XX4xeKIYU6f
-=2i9L
------END PGP MESSAGE-----