diff --git a/installer/resources/certificates/reseed/echelon3_at_mail.i2p.crt b/installer/resources/certificates/reseed/echelon3_at_mail.i2p.crt
new file mode 100644
index 0000000000000000000000000000000000000000..7560a01ec8053bb1837276dd81028572dab05aaa
--- /dev/null
+++ b/installer/resources/certificates/reseed/echelon3_at_mail.i2p.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
diff --git a/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt b/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt
deleted file mode 100644
index ad10e3accd633de3182873a368371a0eebac9a21..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/reseed/echelon_at_mail.i2p.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIESg3kkzANBgkqhkiG9w0BAQ0FADBwMQswCQYDVQQGEwJY
-WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
-b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEZMBcGA1UEAwwQZWNoZWxvbkBtYWls
-LmkycDAeFw0xNDA3MzExNjQ3MDJaFw0yNDA3MzAxNjQ3MDJaMHAxCzAJBgNVBAYT
-AlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBBbm9u
-eW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRkwFwYDVQQDDBBlY2hlbG9uQG1h
-aWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmcEgLwwhzLNe
-XLOMSrhwB8hWpOhfjo4s6S/wjBtjjUc8nI3D0hSn3HY26p0rvcvNEWexPUpPULmC
-exGkU463nu7PiFONiORI1eJAiUFHibRiaA7Wboyo38pO73KirwjG07Y+Ua0jp+HS
-+4FQ/I/9H/bPplReTOU/6hmRbgQ69U8nE68HzZHQxP68yVJ2rPHSXMPhF4R1h0G1
-1mCAT+TgTsnwHNGF77XHJnY4/M4e2cgycEZjZow36C3t2mNDVkMgF19QQeb9WmLR
-zREn3nq9BJqHpUkn9yWw0kKXTZSds+7UxESfzf3BzK0+hky2fh5H+qbYAo2lz4yj
-81MXTAu+4RRkg4DBLlF+2dkclhwQLxxzvkRC6tPkn5i33Yltg7EfzA9IoQ05potJ
-I+iOcF+aStfFgFj9u3B5UkcF4P0cH1QD3c6BK4hIezQYqRoPly1gHqg+XdwjG/dr
-4as7HA9FTz3p2E8nClpIC1x3hfgwAdfd29aeBxO1WW/z99iMF7TBAF+u5T86XEW1
-WpknqCbTli36yJ8a5fPWxZHrryBRJT5yLxejjFeadtutBSwljiVFq+Y38VqwFivq
-VLiBt7IxAsZ8iilgfnnnAvBH6chWfSKb4H7kB4TJvDiV96QmmvoEaWYNHZozMhyK
-tO3b5w+xqbJXyCLA3Q75jD0km76hjcECAwEAAaMhMB8wHQYDVR0OBBYEFAHQcAam
-QRS/EUhuCSr9pB4Ux0rYMA0GCSqGSIb3DQEBDQUAA4ICAQBq1+1QLmgLAjrTg3tb
-4XKgAVICQRoBDNUEobQg3pYeUX9eFNya2RxNljuvYpwT80ilGMPOXcjddmr5ngiK
-dbGRcuuJk9MPEHtPaPT3+JJlvKQ3B3g2wva2Wz2OAyLZUGQs389K4nTbwh4QF0n2
-aHFL8BHiD62hiKnCoNaW4ZovUNNvOxo9lMyAiaFU2gqQNcdad8hP9EAllbvbxDx9
-Tjww2UbwQUIHS9rna4Tlu+f0hDXTWIutc2A51W2fJCb7L3+lYO7Wv55ND/WtryLZ
-XpMp27+MpuEnN3kQmz/l9R0hIJsWc/x9GQkjm5wEaIZEyTtenqwRKGmVCtAj0Pgv
-jn1L3/lWmrNq+OZHb/QeyfKtA3nXfQKVmT98ewQiK/S5i1xIAXCJPytOD887b/o1
-cdurTmCiZMwgiQ+HLJqCg3MDa5mvKqRkRdZXfE6aQWEcSbpAhpV15R17q7L+Fg0W
-shLSNucxyGNU8PjiC/nOmqfqUiPiMltJjPmscxBLim8foyxjakC4+6N6m+Jzgznj
-PocBehFAfKYj66XEwzIBN7Z2uuXoYH9YptkocFjTzvchcryVulDWZ4FWxreUMhpM
-4oyjjhSB4tB9clXlwMqg577q3D6Ms0zLTqsztyPN3zr6jGev3jpVq7Q1GOlciHPv
-JNJOWTH/Vas1W6XlwGcOOAARTQ==
------END CERTIFICATE-----
diff --git a/installer/resources/certificates/ssl/echelon.reseed2017.crt b/installer/resources/certificates/ssl/echelon.reseed2017.crt
deleted file mode 100644
index e7b58bb86e7f51a58150e5f95b93c4d053baa1ae..0000000000000000000000000000000000000000
--- a/installer/resources/certificates/ssl/echelon.reseed2017.crt
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIJAJzD01zwSBKsMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
-VQQGEwJERTEQMA4GA1UECAwHR2VybWFueTESMBAGA1UEBwwJRnJhbmtmdXJ0MQww
-CgYDVQQKDANJMlAxDzANBgNVBAsMBnJlc2VlZDEeMBwGA1UEAwwVcmVzZWVkLmky
-cC1wcm9qZWt0LmRlMSIwIAYJKoZIhvcNAQkBFhNlY2hlbG9uQGkycG1haWwub3Jn
-MCAXDTE3MDIxMTE5MTUyNloYDzIwNTAxMTMwMTkxNTI2WjCBljELMAkGA1UEBhMC
-REUxEDAOBgNVBAgMB0dlcm1hbnkxEjAQBgNVBAcMCUZyYW5rZnVydDEMMAoGA1UE
-CgwDSTJQMQ8wDQYDVQQLDAZyZXNlZWQxHjAcBgNVBAMMFXJlc2VlZC5pMnAtcHJv
-amVrdC5kZTEiMCAGCSqGSIb3DQEJARYTZWNoZWxvbkBpMnBtYWlsLm9yZzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALX9QXseJD1t0FeAK4YysZaIx1mv
-uOnpFjmTeR06perdAX/2N7sKyJpcTo1CCEaDf5CxADAIr6Bt9IkCfvLYQRIV8TM/
-bVF7W52sW8PyHC2jEx/s28hp4UtYasPISt+QYT9ByOgcV02/InGE9FwnXi6mvKvv
-0VeC71OiMBT/I9Z5Z+VknapdM9D+kYXT3+pjjneSxn2XZ7kfnegydQ0J63nrGOi7
-Lj4Syj84GtPc0Bgv4QLvmB+70X2Qr/X1TZt7QuxqFh0StgdQU1pT4r9PRgzcA4FN
-NScPbcPUycmvBptbel31z2s7jos9AnGeWvVd63y8bbRpVzGft51yZtcUDo8CAwEA
-AaNQME4wHQYDVR0OBBYEFLzp7fVErgTYTMqLdh8uHlr3kDDYMB8GA1UdIwQYMBaA
-FLzp7fVErgTYTMqLdh8uHlr3kDDYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAKz+q73JpbqNjjXtg2/A+AXoOOhLd6Qah8a2AtiB/H2RevWem/09J1sb
-VIkW4/YT6GLGg8UbHJLzlQxs8Apk2J0ebWTeQZOvy07tADKMrItrKyEY/HZk7d2L
-7Dnz0QJ/JoJJBmjqQxFtZ2um0FyoT/bvxg03pJv0ZCQWTNpZcez0jHqMTdN1DqSJ
-2oN163rHrINyCGGAlm1x1O/SKRWA4bD7CBBasarilYb3gbjSVZiuSF9zw8zl0KRh
-AH0AqQ2sOSoyY/t5d03YEKMwzM9yQ9MZ0mB34TgiqgRJmKH4nSep0ARqp14oeagA
-pZjtThe6YgidpmH1UXFYbRzHxU4NYCk=
------END CERTIFICATE-----
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index 1b0c97d25d3e90b0d614d513a105badf53eeeee3..6fe4d0c58d5499f636ab9e458c6b2dcf41481588 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -111,14 +111,14 @@ public class Reseeder {
         //
         // https url:port, ending with "/"              // certificates/reseed/      // certificates/ssl/          // notes
         // ----------------------------------           ------------------------     -------------------------     ---------------
+        "https://reseed2.i2p.net/"            + ',' +   // echelon3_at_mail.i2p.crt  // CA
         "https://banana.incognet.io/"         + ',' +   // rambler_at_mail.i2p.crt   // CA
         "https://reseed.diva.exchange/"       + ',' +   // reseed_at_diva.exchange.crt       // CA
         "https://reseed.i2pgit.org/"          + ',' +   // hankhill19580_at_gmail.com.crt    // CA
         "https://i2p.novg.net/"               + ',' +   // igor_at_novg.net.crt      // CA                         // Java 8+ only
         "https://i2pseed.creativecowpat.net:8443/" + ',' + // creativecowpat_at_mail.i2p.crt // i2pseed.creativecowpat.net.crt // Java 7+
         "https://reseed.onion.im/"            + ',' +   // lazygravy_at_mail.i2p     // CA                         // Java 8+ only
-        "https://reseed.memcpy.io/"           + ',' +   // hottuna_at_mail.i2p.crt   // CA                         // SNI required
-        "https://reseed.i2p-projekt.de/";               // echelon_at_mail.i2p.crt   // echelon.reseed2017.crt     // Java 8+
+        "https://reseed.memcpy.io/";                    // hottuna_at_mail.i2p.crt   // CA                         // SNI required
 
     private static final String SU3_FILENAME = "i2pseeds.su3";