diff --git a/content/pgp/assets/fingerprint b/content/pgp/assets/fingerprint
new file mode 100644
index 0000000..d442a7a
--- /dev/null
+++ b/content/pgp/assets/fingerprint
@@ -0,0 +1 @@
+F2B9F713E7ED627336DD85E444FA3F28CD931BB0
diff --git a/content/pgp/assets/marko_korhonen_gpg.asc b/content/pgp/assets/marko_korhonen_gpg.asc
new file mode 100644
index 0000000..5d2f798
--- /dev/null
+++ b/content/pgp/assets/marko_korhonen_gpg.asc
@@ -0,0 +1,23 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYwsToBYJKwYBBAHaRw8BAQdApgyyyWCnj7YEUA3QDR0uoYh1fY80gxj4pT7/
+hogiE8G0Ik1hcmtvIEtvcmhvbmVuIDxtYXJrb0Brb3Job25lbi5jYz6IkAQTFggA
+OBYhBPK59xPn7WJzNt2F5ET6PyjNkxuwBQJjCxOgAhsBBQsJCAcCBhUKCQgLAgQW
+AgMBAh4BAheAAAoJEET6PyjNkxuwcqMA/jWSOCG1zpLYTqaekMfoto/B8Eny1hU4
+fChQWvn0UXSyAQDTkoXRAf2TVo+4YiXXwPEsaF6W/o4a1Xkoy63zMmrFCLgzBGML
+E+sWCSsGAQQB2kcPAQEHQJVPuPdpwlrHc+07XCHd+7mNjjLInBm54B8wYQIn8+zs
+iPUEGBYIACYWIQTyufcT5+1iczbdheRE+j8ozZMbsAUCYwsT6wIbAgUJAeEzgACB
+CRBE+j8ozZMbsHYgBBkWCAAdFiEEqSLN4audtf0/wGI8p/eLy4Wc2JAFAmMLE+sA
+CgkQp/eLy4Wc2JA5wQEA9NC8JQLUxl8BOtxWE6K5UoBq6t/YXaKvDGusC13G2MAB
+ALTAC3Ul7Oj35GSeT7dRpJ5b+hza0BUIBUFkcmaXthQM2MEBAP2DOXAzJsxhdf4N
+liRhAI/ew1Zr+r4ElCxJJ1DuG11FAP9ON5kjRnnC5jZ55KeNicQiXZBm7YEnBc8J
+PwKV5QIMDbg4BGMLFAISCisGAQQBl1UBBQEBB0ClI43rSBTD9M+1UyP4Nc2c8GTh
+iyNadsSNl6E6HLECWQMBCAeIfgQYFggAJhYhBPK59xPn7WJzNt2F5ET6PyjNkxuw
+BQJjCxQCAhsMBQkB4TOAAAoJEET6PyjNkxuwFjQA/AmlxhP6jnQcd8heb2Ax5gjr
+pNqBnoXUHiFxDL6kU4FqAP9cpUinfRf5mUlkXbjA+aerBrU3KXnsU4TWJbrDk4uB
+ArgzBGMLFBIWCSsGAQQB2kcPAQEHQHLUrf0LpumX6XEkPW6Z105sgJMWWOllWy7s
+xB+lgdUwiH4EGBYIACYWIQTyufcT5+1iczbdheRE+j8ozZMbsAUCYwsUEgIbIAUJ
+AeEzgAAKCRBE+j8ozZMbsHMcAQClJrRrRv6GoALszNxL7BG8ehIuidFebuRAYH9q
+YDSBZAD+LxQu3fZ2xSApXkIBUtT1QN490uMPxXaP6qTO51suowk=
+=kIIK
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/content/pgp/assets/marko_korhonen_gpg.asc.sig b/content/pgp/assets/marko_korhonen_gpg.asc.sig
new file mode 100644
index 0000000..8c65814
Binary files /dev/null and b/content/pgp/assets/marko_korhonen_gpg.asc.sig differ
diff --git a/content/pgp/marko_korhonen_gpg.asc b/content/pgp/assets/old_key/marko_korhonen_gpg.asc
similarity index 100%
rename from content/pgp/marko_korhonen_gpg.asc
rename to content/pgp/assets/old_key/marko_korhonen_gpg.asc
diff --git a/content/pgp/openkeychain.svg b/content/pgp/assets/openkeychain.svg
similarity index 100%
rename from content/pgp/openkeychain.svg
rename to content/pgp/assets/openkeychain.svg
diff --git a/content/pgp/fingerprint b/content/pgp/fingerprint
deleted file mode 100644
index 7190a02..0000000
--- a/content/pgp/fingerprint
+++ /dev/null
@@ -1 +0,0 @@
-1EFC4DBB079407113A761DF7C514037F1EFF4FA6
diff --git a/content/pgp/index.adoc b/content/pgp/index.adoc
index 596f735..2feb6d3 100644
--- a/content/pgp/index.adoc
+++ b/content/pgp/index.adoc
@@ -14,7 +14,7 @@ the right page. Next up is my public key in different formats.
 
 [source]
 ----
-include::fingerprint[]
+include::assets/fingerprint[]
 ----
 
 This is my key fingerprint and it can be found around the various
@@ -23,11 +23,11 @@ I have not really bothered with keyservers so see below for the full key.
 
 == ASCII Armor
 
-link:marko_korhonen_gpg.asc[Click to download]
+link:assets/marko_korhonen_gpg.asc[Click to download]
 
 == OpenKeychain
 
 The following QR code should be importable in the Android app
 OpenKeyChain but this relys on keyservers so your results may vary.
 
-image:openkeychain.svg[OpenKeychain]
+image:assets/openkeychain.svg[OpenKeychain]
diff --git a/content/pgp/index.fi.adoc b/content/pgp/index.fi.adoc
index ae533ac..e8db4f4 100644
--- a/content/pgp/index.fi.adoc
+++ b/content/pgp/index.fi.adoc
@@ -13,7 +13,7 @@ oikeaan paikkaan. Seuraavaksi on julkinen avaimeni saatavilla eri formaateissa.
 
 [source]
 ----
-include::fingerprint[]
+include::assets/fingerprint[]
 ----
 
 Tämä on avaimeni sormenjälki ja se löytyy monilta avainservereiltä. SKS
@@ -22,7 +22,7 @@ avaintani servereillä.
 
 == ASCII Armor
 
-link:marko_korhonen_gpg.asc[Klikkaa ladataksesi]
+link:assets/marko_korhonen_gpg.asc[Klikkaa ladataksesi]
 
 == OpenKeychain
 
@@ -30,4 +30,4 @@ Seuraava QR koodi pitäisi olla yhteensopiva OpenKeyChain Android-sovelluksen
 kanssa. Se taitaa kuitenkin luottaa avainservereihin, joten tuloksesi voi
 vaihdella.
 
-image:openkeychain.svg[OpenKeychain]
+image:assets/openkeychain.svg[OpenKeychain]