diff --git a/pom.xml b/pom.xml
index 510c4ff..d681c6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>uk.ngs</groupId>
     <artifactId>CertWizard</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -171,7 +171,7 @@
                             <storepass>${codesignpass}</storepass>
                             <!--suppress UnresolvedMavenProperty -->
                             <keypass>${codesignpass}</keypass>
-                            <alias>1</alias>
+                            <alias>000_ukricodesign</alias>
                         </configuration>
                     </plugin>
                     
@@ -182,7 +182,7 @@
                         <configuration>
                             <mainClass>${mainClass}</mainClass>
                             <bundleJre>true</bundleJre>
-                            <version>2.1.0</version>
+                            <version>2.1.1</version>
                             <displayName>CertWizard</displayName>
                             <organizationName>STFC</organizationName>
                             <organizationUrl>https://stfc.ukri.org</organizationUrl>
@@ -212,7 +212,8 @@
                                             <storetype>PKCS12</storetype>
                                             <keystore>${codeSignCert}</keystore>
                                             <!--suppress UnresolvedMavenProperty -->
-                                            <storepass>${codesignpass}</storepass>
+					                        <storepass>${codesignpass}</storepass>
+					                        <alias>000_ukricodesign</alias>
                                         </signing>
                                     </winConfig>
                                 </configuration>
@@ -226,7 +227,7 @@
                                 <configuration>
                                     <platform>mac</platform>
                                     <createZipball>true</createZipball>
-                                    <jdkPath>C:\jdk\mac\jdk-11.0.18+10\Contents\Home</jdkPath>
+                                    <jdkPath>C:\jdk\mac\jdk-17.0.6+10\Contents\Home</jdkPath>
                                     <macConfig>
                                         <icnsFile>src/main/resources/ngs-icon.icns</icnsFile>
                                     </macConfig>
@@ -238,4 +239,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/resources/configure.properties b/src/main/resources/configure.properties
index c95e8ef..edb7453 100644
--- a/src/main/resources/configure.properties
+++ b/src/main/resources/configure.properties
@@ -3,8 +3,8 @@
 
 # Client side version of this tool (this must correspond to the version
 # supported by the server.
-ngsca.certwizard.version=CertWizard 2.1.0
-ngsca.certwizard.versionNumber=2.1.0
+ngsca.certwizard.version=CertWizard 2.1.1
+ngsca.certwizard.versionNumber=2.1.1
 
 # CA-Server host that this tool is configured to work with.
 #ngsca.base.url=https://ca-dev.esc.rl.ac.uk
@@ -52,7 +52,7 @@ uk.ngs.ca.immegration.password.property=NGSCAPKCS12PASSWORD
 uk.ngs.ca.request.csr.url=https://cwiz-live.ca.ngs.ac.uk:443/CSR
 uk.ngs.ca.request.ca.url=https://cwiz-live.ca.ngs.ac.uk:443/CA
 uk.ngs.ca.request.ca.motd.text.url=https://cwiz-live.ca.ngs.ac.uk:443/CA/motd/text
-uk.ngs.ca.request.useragent=NGS-CertWizard/2.1.0
+uk.ngs.ca.request.useragent=NGS-CertWizard/2.1.1
 uk.ngs.ca.request.resource.publickey=https://cwiz-live.ca.ngs.ac.uk:443/resources/resource/publickey
 
 uk.ngs.ca.request.certificate.url=https://cwiz-live.ca.ngs.ac.uk:443/certificate
diff --git a/src/main/resources/escience-2b.pem b/src/main/resources/escience-2b.pem
index 0209f19..940ad6b 100644
--- a/src/main/resources/escience-2b.pem
+++ b/src/main/resources/escience-2b.pem
@@ -1,21 +1,23 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+9qoDx3FeEg==
 -----END CERTIFICATE-----
diff --git a/src/main/resources/escience-root.pem b/src/main/resources/escience-root.pem
index 2d574fb..f84b171 100644
--- a/src/main/resources/escience-root.pem
+++ b/src/main/resources/escience-root.pem
@@ -1,23 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgICAQAwDQYJKoZIhvcNAQEFBQAwVDELMAkGA1UEBhMCVUsx
-FTATBgNVBAoTDGVTY2llbmNlUm9vdDESMBAGA1UECxMJQXV0aG9yaXR5MRowGAYD
-VQQDExFVSyBlLVNjaWVuY2UgUm9vdDAeFw0xMTA2MTgxMzAwMDBaFw0yNzEwMzAw
-OTAwMDBaMFMxCzAJBgNVBAYTAlVLMRMwEQYDVQQKEwplU2NpZW5jZUNBMRIwEAYD
-VQQLEwlBdXRob3JpdHkxGzAZBgNVBAMTElVLIGUtU2NpZW5jZSBDQSAyQjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkLgb2eIcly4LZfj0Rf5F7s+HE/
-6Tvpf4jsKkm7qs33y3EEudCbcPwQKjS2MgytPv+8xpEPHqy/hqTseNlZ6oJgc+V8
-xlJ+0iws882Ca8a9ZJ/iGQH9UzXU4q35ArN3cbwoWAAvMvzZ6hUV86fAAQ1AueQN
-6h7/tnfYfaUMiB4PNxucmouMHDJGmYzl47FtlLeHUr2c4m/oWSG5pADIvGFpWFHj
-NIw8/x4n97w5/ks0tc/8/5Q6xzUfCX/VfqciQCvKcui2J5MBhUlBDLenzwqvUytB
-4XAwX/pRcKmnFEYwoc9OKGExNx9tn9RjQYJAC/KLb44Jqno9l0eRxu3uw4sCAwEA
-AaOBnzCBnDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA5BgNVHR8E
-MjAwMC6gLKAqhihodHRwOi8vY3JsLmNhLm5ncy5hYy51ay9jcmwvcm9vdC1jcmwu
-ZGVyMB0GA1UdDgQWBBQSpb+Rn3/ir2pcCfLi+lngNuHzVTAfBgNVHSMEGDAWgBRe
-+BtIpndrKTwuAFMzK2Oie36TwDANBgkqhkiG9w0BAQUFAAOCAQEAFQlXpYR45+fy
-uKIh/c+7nIxODO5iWmKskxDSQhqhMCU8/d5WVfXZ35XoTakhhsxu+Q3smIa6AhbA
-meAhIWc2kDgDatEUlMA5G3TQgUoQgjw5RAWxX5/7biaj2nSU7B4Nn5llOp4g+p9P
-5H+wGm2KFhvslaoKBKhSUkM/1teS+XsoDjqaPp/4RQ80ywUYhVWJz18vH1ltWLQW
-93i3mnLDDb+aOyeoxqIPCQSy6Q8nIYoM8e3jYvdjjZNruT45g6IK6bx7eQmEMfO+
-u7qJiCKWGMxY+72ZeOw/0DMw4y8kU0wrl7gQ1o1Jk94hHNpBam+hX0Btc1K7YwXB
-CemmHAuKQw==
------END CERTIFICATE-----
\ No newline at end of file
+MIIDiDCCAnCgAwIBAgIDAQAAMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNVBAYTAlVL
+MRUwEwYDVQQKEwxlU2NpZW5jZVJvb3QxEjAQBgNVBAsTCUF1dGhvcml0eTEaMBgG
+A1UEAxMRVUsgZS1TY2llbmNlIFJvb3QwHhcNMDcxMDMwMDkwMDAwWhcNMjcxMDMw
+MDkwMDAwWjBUMQswCQYDVQQGEwJVSzEVMBMGA1UEChMMZVNjaWVuY2VSb290MRIw
+EAYDVQQLEwlBdXRob3JpdHkxGjAYBgNVBAMTEVVLIGUtU2NpZW5jZSBSb290MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzc5G2aZQei3ANN8Afn94iWjf
+4EqgSUN5p43lKDaWE+7SVo9yHukcpLOWrIeZkayTd9lvyEGY7SUPj350qcDfXMtT
+qSgGN7VMep2sZk9yNObSWFz9KPOwG1abigL9ulgEAKWIH3Brd5K5ThGqrvWfv7gn
+5Y4q9oMe9pN1FgTenKJ7Zd7lBMjwJd50IyHXz4R0W/CVXv12WY1E1j3dlZS7o84v
+p34tqlCRSZqxcuPKM3Nyg9eAPIZq4c6qbKrG4/Hi0NOwLbmcqv7srmTdP6WmUn+M
+yRCX9AeCqcAEFdAgvPOu3RrydB0zw40D5uG37yzLh43/TMy6U2PyQDOu62SEmwID
+AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUXvgbSKZ3ayk8LgBTMytjont+k8AwHwYDVR0jBBgwFoAUXvgbSKZ3ayk8LgBT
+Mytjont+k8AwDQYJKoZIhvcNAQELBQADggEBAAYaJ/u66lGwzRoZM24QZ3FvHIVi
+LHyizT5L+GhGIPXQPvoQ0EaiMOQ1xUzMy96DMKfA7ltGOTyBlUm5KbxE2uj5azB/
+NujdFkGXP+dom3gX7khYV38OBMVu8a/O6aqXmaI8I5mQzl0TwQ3cCVWJO1kzx96e
+I7TRHZpGtng5rw4fuwdoOgoC/jXo0UOGki3YHMIFg+K9/d9yamdAfYmvbk3tfapT
+slZumdeFaZpRZqnxTI+jqhJkt3bsfLO27JQgCz5glxoDdjnBsFbcDgKVZcw8hps8
+9HduUIgoQHKnvVyuJoZiDXEFUH3Sonnf8LcnwvYPeaOHoriz0S4Q1RKug40=
+-----END CERTIFICATE-----