diff --git a/files/hpc.aaf-metadata-cert.pem b/files/hpc.aaf-metadata-cert.pem
new file mode 100644
index 0000000000000000000000000000000000000000..2040f9b0c4f3fe515551f9f0e51ce57635920312
--- /dev/null
+++ b/files/hpc.aaf-metadata-cert.pem
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+        Validity
+            Not Before: Aug  5 00:44:26 2015 GMT
+            Not After : Aug  2 00:44:26 2025 GMT
+        Subject: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=hpc.erc.monash.edu.au/name=EasyRSA/emailAddress=help@massive.org.au
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:b4:7b:74:2f:6d:c8:76:85:de:65:76:7a:00:e8:
+                    5f:25:ce:11:f6:87:ca:d2:f0:ce:44:31:f7:5b:c9:
+                    5b:7e:f9:b8:0d:38:a7:b3:1d:e4:93:ae:f5:82:a9:
+                    96:7f:55:ff:f7:4a:fe:7d:a8:20:9b:45:78:12:56:
+                    21:90:d2:ca:5d:de:d1:86:68:b9:d7:8a:54:df:36:
+                    22:71:75:f4:0b:70:76:3b:01:8f:65:cb:86:19:c6:
+                    80:8d:d4:f1:97:45:ea:ce:a0:af:14:e8:c3:d3:c3:
+                    47:b1:7b:04:ba:27:4f:45:3b:ee:bc:d8:40:23:24:
+                    8a:0e:e1:76:e0:db:42:65:1e:e9:8e:91:88:50:33:
+                    2c:5f:5d:72:97:4f:2a:2f:91:14:1c:6c:c7:91:91:
+                    ea:b0:68:b6:66:ed:00:92:38:ec:4b:09:7d:75:d6:
+                    3d:45:95:ea:fa:17:12:04:be:30:3c:81:d7:9b:ae:
+                    73:2c:f4:41:4b:43:fe:84:9b:79:87:f1:c3:6d:91:
+                    32:38:85:68:04:74:87:e6:8b:b3:b2:b5:09:98:e4:
+                    95:f3:79:bf:aa:03:39:15:e4:66:91:2d:ac:64:92:
+                    9e:f6:32:dc:2b:ab:88:9b:47:16:5e:ba:7b:65:17:
+                    b0:92:ae:64:1c:de:6b:92:e5:60:0c:02:ec:da:51:
+                    59:f3
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                Easy-RSA Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6A:1A:D1:74:5D:CB:58:D3:45:67:4A:1E:BA:AD:BF:3E:7D:52:4B:D8
+            X509v3 Authority Key Identifier: 
+                keyid:50:24:3A:61:59:41:72:B9:05:23:52:C4:8C:37:C5:C6:09:68:F6:91
+                DirName:/C=AU/ST=Victoria/L=Melbourne/O=Monash/OU=MeRC/CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+                serial:CF:7A:9C:05:95:C3:2C:34
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+         a3:36:12:77:34:53:d5:87:cc:d7:07:c9:ee:d2:3d:36:0e:1b:
+         02:e0:9f:8d:da:79:36:e9:77:67:c8:9d:68:5b:c4:2e:81:b1:
+         ed:25:d0:6d:1f:70:68:c7:09:c2:86:d5:4a:da:0d:62:81:a8:
+         a3:4a:2e:ba:6b:da:d6:d5:c5:ae:bf:a4:69:04:99:50:70:95:
+         8e:c2:4a:1d:37:78:eb:5b:d8:e3:04:c5:06:1a:33:a8:0b:14:
+         42:7c:0f:1b:fd:b8:d8:6e:0a:7f:a0:05:6d:32:ee:fb:12:ed:
+         57:60:c3:b5:d9:ad:13:a0:96:9d:ff:4b:98:d3:a5:3e:75:35:
+         15:d7:26:50:39:c5:52:d3:2c:65:ba:21:ea:b6:4a:25:31:55:
+         fc:db:9c:e4:c2:cf:99:56:50:19:b2:04:45:03:2f:bf:e1:86:
+         ae:2b:c3:84:e4:b8:42:2b:d1:e5:99:ff:8c:89:93:b9:ef:2d:
+         36:be:a5:07:77:70:8d:1a:df:71:f1:67:60:30:c7:64:ee:8d:
+         3d:5d:b9:86:e9:1d:bb:0a:bf:3b:64:40:23:53:ab:0f:ab:3b:
+         ce:33:20:a0:d1:c0:75:38:f7:43:86:88:5b:c4:a2:64:9a:c7:
+         df:d3:d6:74:d0:9c:0f:ca:fd:fa:42:e7:9c:30:d3:49:94:8d:
+         13:c6:2c:1c
+-----BEGIN CERTIFICATE-----
+MIIFHDCCBASgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCQVUx
+ETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNVBAoT
+Bk1vbmFzaDENMAsGA1UECxMETWVSQzESMBAGA1UEAxMJTW9uYXNoIENBMRAwDgYD
+VQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1
+MB4XDTE1MDgwNTAwNDQyNloXDTI1MDgwMjAwNDQyNlowgaoxCzAJBgNVBAYTAkFV
+MREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQK
+EwZNb25hc2gxDTALBgNVBAsTBE1lUkMxHjAcBgNVBAMTFWhwYy5lcmMubW9uYXNo
+LmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAGCSqGSIb3DQEJARYTaGVscEBt
+YXNzaXZlLm9yZy5hdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALR7
+dC9tyHaF3mV2egDoXyXOEfaHytLwzkQx91vJW375uA04p7Md5JOu9YKpln9V//dK
+/n2oIJtFeBJWIZDSyl3e0YZoudeKVN82InF19AtwdjsBj2XLhhnGgI3U8ZdF6s6g
+rxTow9PDR7F7BLonT0U77rzYQCMkig7hduDbQmUe6Y6RiFAzLF9dcpdPKi+RFBxs
+x5GR6rBotmbtAJI47EsJfXXWPUWV6voXEgS+MDyB15uucyz0QUtD/oSbeYfxw22R
+MjiFaAR0h+aLs7K1CZjklfN5v6oDORXkZpEtrGSSnvYy3CuriJtHFl66e2UXsJKu
+ZBzea5LlYAwC7NpRWfMCAwEAAaOCAVUwggFRMAkGA1UdEwQCMAAwLQYJYIZIAYb4
+QgENBCAWHkVhc3ktUlNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU
+ahrRdF3LWNNFZ0oeuq2/Pn1SS9gwgdMGA1UdIwSByzCByIAUUCQ6YVlBcrkFI1LE
+jDfFxglo9pGhgaSkgaEwgZ4xCzAJBgNVBAYTAkFVMREwDwYDVQQIEwhWaWN0b3Jp
+YTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQKEwZNb25hc2gxDTALBgNVBAsT
+BE1lUkMxEjAQBgNVBAMTCU1vbmFzaCBDQTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAG
+CSqGSIb3DQEJARYTaGVscEBtYXNzaXZlLm9yZy5hdYIJAM96nAWVwyw0MBMGA1Ud
+JQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAQEA
+ozYSdzRT1YfM1wfJ7tI9Ng4bAuCfjdp5Nul3Z8idaFvELoGx7SXQbR9waMcJwobV
+StoNYoGoo0ouumva1tXFrr+kaQSZUHCVjsJKHTd461vY4wTFBhozqAsUQnwPG/24
+2G4Kf6AFbTLu+xLtV2DDtdmtE6CWnf9LmNOlPnU1FdcmUDnFUtMsZboh6rZKJTFV
+/Nuc5MLPmVZQGbIERQMvv+GGrivDhOS4QivR5Zn/jImTue8tNr6lB3dwjRrfcfFn
+YDDHZO6NPV25hukduwq/O2RAI1OrD6s7zjMgoNHAdTj3Q4aIW8SiZJrH39PWdNCc
+D8r9+kLnnDDTSZSNE8YsHA==
+-----END CERTIFICATE-----
diff --git a/files/hpc.erc.monash.edu.au.crt b/files/hpc.erc.monash.edu.au.crt
new file mode 100644
index 0000000000000000000000000000000000000000..2040f9b0c4f3fe515551f9f0e51ce57635920312
--- /dev/null
+++ b/files/hpc.erc.monash.edu.au.crt
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+        Validity
+            Not Before: Aug  5 00:44:26 2015 GMT
+            Not After : Aug  2 00:44:26 2025 GMT
+        Subject: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=hpc.erc.monash.edu.au/name=EasyRSA/emailAddress=help@massive.org.au
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:b4:7b:74:2f:6d:c8:76:85:de:65:76:7a:00:e8:
+                    5f:25:ce:11:f6:87:ca:d2:f0:ce:44:31:f7:5b:c9:
+                    5b:7e:f9:b8:0d:38:a7:b3:1d:e4:93:ae:f5:82:a9:
+                    96:7f:55:ff:f7:4a:fe:7d:a8:20:9b:45:78:12:56:
+                    21:90:d2:ca:5d:de:d1:86:68:b9:d7:8a:54:df:36:
+                    22:71:75:f4:0b:70:76:3b:01:8f:65:cb:86:19:c6:
+                    80:8d:d4:f1:97:45:ea:ce:a0:af:14:e8:c3:d3:c3:
+                    47:b1:7b:04:ba:27:4f:45:3b:ee:bc:d8:40:23:24:
+                    8a:0e:e1:76:e0:db:42:65:1e:e9:8e:91:88:50:33:
+                    2c:5f:5d:72:97:4f:2a:2f:91:14:1c:6c:c7:91:91:
+                    ea:b0:68:b6:66:ed:00:92:38:ec:4b:09:7d:75:d6:
+                    3d:45:95:ea:fa:17:12:04:be:30:3c:81:d7:9b:ae:
+                    73:2c:f4:41:4b:43:fe:84:9b:79:87:f1:c3:6d:91:
+                    32:38:85:68:04:74:87:e6:8b:b3:b2:b5:09:98:e4:
+                    95:f3:79:bf:aa:03:39:15:e4:66:91:2d:ac:64:92:
+                    9e:f6:32:dc:2b:ab:88:9b:47:16:5e:ba:7b:65:17:
+                    b0:92:ae:64:1c:de:6b:92:e5:60:0c:02:ec:da:51:
+                    59:f3
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                Easy-RSA Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6A:1A:D1:74:5D:CB:58:D3:45:67:4A:1E:BA:AD:BF:3E:7D:52:4B:D8
+            X509v3 Authority Key Identifier: 
+                keyid:50:24:3A:61:59:41:72:B9:05:23:52:C4:8C:37:C5:C6:09:68:F6:91
+                DirName:/C=AU/ST=Victoria/L=Melbourne/O=Monash/OU=MeRC/CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+                serial:CF:7A:9C:05:95:C3:2C:34
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+         a3:36:12:77:34:53:d5:87:cc:d7:07:c9:ee:d2:3d:36:0e:1b:
+         02:e0:9f:8d:da:79:36:e9:77:67:c8:9d:68:5b:c4:2e:81:b1:
+         ed:25:d0:6d:1f:70:68:c7:09:c2:86:d5:4a:da:0d:62:81:a8:
+         a3:4a:2e:ba:6b:da:d6:d5:c5:ae:bf:a4:69:04:99:50:70:95:
+         8e:c2:4a:1d:37:78:eb:5b:d8:e3:04:c5:06:1a:33:a8:0b:14:
+         42:7c:0f:1b:fd:b8:d8:6e:0a:7f:a0:05:6d:32:ee:fb:12:ed:
+         57:60:c3:b5:d9:ad:13:a0:96:9d:ff:4b:98:d3:a5:3e:75:35:
+         15:d7:26:50:39:c5:52:d3:2c:65:ba:21:ea:b6:4a:25:31:55:
+         fc:db:9c:e4:c2:cf:99:56:50:19:b2:04:45:03:2f:bf:e1:86:
+         ae:2b:c3:84:e4:b8:42:2b:d1:e5:99:ff:8c:89:93:b9:ef:2d:
+         36:be:a5:07:77:70:8d:1a:df:71:f1:67:60:30:c7:64:ee:8d:
+         3d:5d:b9:86:e9:1d:bb:0a:bf:3b:64:40:23:53:ab:0f:ab:3b:
+         ce:33:20:a0:d1:c0:75:38:f7:43:86:88:5b:c4:a2:64:9a:c7:
+         df:d3:d6:74:d0:9c:0f:ca:fd:fa:42:e7:9c:30:d3:49:94:8d:
+         13:c6:2c:1c
+-----BEGIN CERTIFICATE-----
+MIIFHDCCBASgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCQVUx
+ETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNVBAoT
+Bk1vbmFzaDENMAsGA1UECxMETWVSQzESMBAGA1UEAxMJTW9uYXNoIENBMRAwDgYD
+VQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1
+MB4XDTE1MDgwNTAwNDQyNloXDTI1MDgwMjAwNDQyNlowgaoxCzAJBgNVBAYTAkFV
+MREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQK
+EwZNb25hc2gxDTALBgNVBAsTBE1lUkMxHjAcBgNVBAMTFWhwYy5lcmMubW9uYXNo
+LmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAGCSqGSIb3DQEJARYTaGVscEBt
+YXNzaXZlLm9yZy5hdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALR7
+dC9tyHaF3mV2egDoXyXOEfaHytLwzkQx91vJW375uA04p7Md5JOu9YKpln9V//dK
+/n2oIJtFeBJWIZDSyl3e0YZoudeKVN82InF19AtwdjsBj2XLhhnGgI3U8ZdF6s6g
+rxTow9PDR7F7BLonT0U77rzYQCMkig7hduDbQmUe6Y6RiFAzLF9dcpdPKi+RFBxs
+x5GR6rBotmbtAJI47EsJfXXWPUWV6voXEgS+MDyB15uucyz0QUtD/oSbeYfxw22R
+MjiFaAR0h+aLs7K1CZjklfN5v6oDORXkZpEtrGSSnvYy3CuriJtHFl66e2UXsJKu
+ZBzea5LlYAwC7NpRWfMCAwEAAaOCAVUwggFRMAkGA1UdEwQCMAAwLQYJYIZIAYb4
+QgENBCAWHkVhc3ktUlNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU
+ahrRdF3LWNNFZ0oeuq2/Pn1SS9gwgdMGA1UdIwSByzCByIAUUCQ6YVlBcrkFI1LE
+jDfFxglo9pGhgaSkgaEwgZ4xCzAJBgNVBAYTAkFVMREwDwYDVQQIEwhWaWN0b3Jp
+YTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQKEwZNb25hc2gxDTALBgNVBAsT
+BE1lUkMxEjAQBgNVBAMTCU1vbmFzaCBDQTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAG
+CSqGSIb3DQEJARYTaGVscEBtYXNzaXZlLm9yZy5hdYIJAM96nAWVwyw0MBMGA1Ud
+JQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOCAQEA
+ozYSdzRT1YfM1wfJ7tI9Ng4bAuCfjdp5Nul3Z8idaFvELoGx7SXQbR9waMcJwobV
+StoNYoGoo0ouumva1tXFrr+kaQSZUHCVjsJKHTd461vY4wTFBhozqAsUQnwPG/24
+2G4Kf6AFbTLu+xLtV2DDtdmtE6CWnf9LmNOlPnU1FdcmUDnFUtMsZboh6rZKJTFV
+/Nuc5MLPmVZQGbIERQMvv+GGrivDhOS4QivR5Zn/jImTue8tNr6lB3dwjRrfcfFn
+YDDHZO6NPV25hukduwq/O2RAI1OrD6s7zjMgoNHAdTj3Q4aIW8SiZJrH39PWdNCc
+D8r9+kLnnDDTSZSNE8YsHA==
+-----END CERTIFICATE-----
diff --git a/files/hpc.erc.monash.edu.au.key b/files/hpc.erc.monash.edu.au.key
new file mode 100644
index 0000000000000000000000000000000000000000..b0920022dd81273b0dae544cf7391f7f5a8651fb
--- /dev/null
+++ b/files/hpc.erc.monash.edu.au.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0e3Qvbch2hd5l
+dnoA6F8lzhH2h8rS8M5EMfdbyVt++bgNOKezHeSTrvWCqZZ/Vf/3Sv59qCCbRXgS
+ViGQ0spd3tGGaLnXilTfNiJxdfQLcHY7AY9ly4YZxoCN1PGXRerOoK8U6MPTw0ex
+ewS6J09FO+682EAjJIoO4Xbg20JlHumOkYhQMyxfXXKXTyovkRQcbMeRkeqwaLZm
+7QCSOOxLCX111j1Fler6FxIEvjA8gdebrnMs9EFLQ/6Em3mH8cNtkTI4hWgEdIfm
+i7OytQmY5JXzeb+qAzkV5GaRLaxkkp72Mtwrq4ibRxZeuntlF7CSrmQc3muS5WAM
+AuzaUVnzAgMBAAECggEBALBcEmRmOoTWu0MaSo2og5FFlHf6qU8G0AgDa1rdn/Kr
+whXpTrXQeBN326AaZ112g/D570SKjZIsh/AjChmiYOzpVoSowTDFk7mqBG4qfJbR
+BjcShzVJc3isZ+IwOwM+5vuSOIOOEA1VvTDIrQ3aa7OTpO4TwliU0/NGjgubNX3o
+2LzlDWkAuPhwyRng9WcIHs9tphew+9Yg+VuguN8mrhB1cxlTdC8ZnMYzz+kN0EwG
+wAd/b7YtKWb+oPPf6zFjpqKW9jIL60/hxmevqgr3g7YqQtQlcVz2Q8YV3uba9wF1
+DxDnM1jhg6CJiJcne3AZBRni2I9T1Yl3sWBKiwDfP0ECgYEA7fzFVfwAn4jEZN9N
+kLEHvDilDgoRBrwcTceTFTWT8x0KCLRJfKpTnaShVW5mQJCc0pZrhWIpv4QC4waT
+tnkDPeytnpMQ2HgcLeZNF7RXzHYORxQCf0m1yfgDZPkGH6zxJGcb/P6bhXZhli6e
+3w0Ulb7SQtfp9Em8M8vvhg/XMW8CgYEAwiR3gRp7Iwsyre2QhWkvClcM4BubSrWp
+kYnaNIhc5str4tYOBolb5w//Oe3yI3CTU5IKIrJWvbE4UCdD2yqAzEhDEOBCEymq
+nGrn1zXHg4Ba1EzFvYlNZi1JZqoOS0S+COj9+W5pBtBJ6djduBJ4Qj9QHJdyIMI3
+XFD6QId4Vb0CgYBgmO3cRcpW9uOIch8AsOqL2o4cUbexfR8b7vrja/jegBX3jH4b
+jOMdpJobnBEC+e+9hnKkFEEPzFyDm8LPGPVY6D1clSMMSkxd0RHPolLU2cJX1WZi
+FiAkl3eBP5bduouyk+uHWCz2EiPwGoI/1QZa9bZQjWUX0+oBODDDwKA/HwKBgBBm
+RDIDqqMrLvzCNJMQb4jQEaZcrqGA9vH0Uxpc6nwUcuiWbFjhAYJjN4wNLYcQ22ET
+1QdZSTp83eTnbDP3Qyn+cKvcRbiYrHDKFwt234OcNA/67Dk2f/NBoBGsC8kP5X2b
+MNkBGp4YuiWmzBPge4gdEQdZQ6rAvSxvKrSIvQGBAoGBAOe0re6EPs7ZFcziebPR
+C60moSec5h7yZWetiQJBdoK29mGP38M7JDjTz2jXcF8/w5iEE6RWjIutuPRXWLKH
+9cx3IudISht6WqTWFJckX76nR2kmSKFEMOkYCZ9flXU1F4PZWVRsMl9vbcROsRQl
+3/dE5d856cQt7klh5yxDbe4f
+-----END PRIVATE KEY-----
diff --git a/files/hpc.metadata.aaf.xml b/files/hpc.metadata.aaf.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec9b342f4f7d06e146c02eb1e02b335c7db926fd
--- /dev/null
+++ b/files/hpc.metadata.aaf.xml
@@ -0,0 +1,101 @@
+<EntityDescriptor entityID="https://hpc.erc.monash.edu.au/shibboleth" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <dsr:DiscoveryResponse xmlns:dsr="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/Login" index="0" isDefault="true" />
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFEzCCA/ugAwIBAgIUN+JS0LBsAM/FnwLBPh/yh3MQtnMwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDgwNTIzMTM0
+OVoXDTE4MDgwNTIzMTM0NlowgZwxCzAJBgNVBAYTAkFVMQwwCgYDVQQIEwNWSUMx
+EDAOBgNVBAcTB0NsYXl0b24xGjAYBgNVBAoTEU1vbmFzaCBVbml2ZXJzaXR5MQ0w
+CwYDVQQLEwRNZVJDMR4wHAYDVQQDExVocGMuZXJjLm1vbmFzaC5lZHUuYXUxIjAg
+BgkqhkiG9w0BCQEWE2hlbHBAbWFzc2l2ZS5vcmcuYXUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC0e3Qvbch2hd5ldnoA6F8lzhH2h8rS8M5EMfdbyVt+
++bgNOKezHeSTrvWCqZZ/Vf/3Sv59qCCbRXgSViGQ0spd3tGGaLnXilTfNiJxdfQL
+cHY7AY9ly4YZxoCN1PGXRerOoK8U6MPTw0exewS6J09FO+682EAjJIoO4Xbg20Jl
+HumOkYhQMyxfXXKXTyovkRQcbMeRkeqwaLZm7QCSOOxLCX111j1Fler6FxIEvjA8
+gdebrnMs9EFLQ/6Em3mH8cNtkTI4hWgEdIfmi7OytQmY5JXzeb+qAzkV5GaRLaxk
+kp72Mtwrq4ibRxZeuntlF7CSrmQc3muS5WAMAuzaUVnzAgMBAAGjggGZMIIBlTBz
+BggrBgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlz
+Z2xvYmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xv
+YmFsLmNvbS9xdnNzbGcyLmNydDAgBgNVHREEGTAXghVocGMuZXJjLm1vbmFzaC5l
+ZHUuYXUwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYo
+aHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQY
+MBaAFJEZYq1bF6cw+/DeOSWxvYy5uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBRq
+GtF0XctY00VnSh66rb8+fVJL2DANBgkqhkiG9w0BAQsFAAOCAQEA1yex1Ar4OE5A
+haHeC51rBaI3jRW0eAzu0DpJ3Ne6YHXScDBDhdsr/1txGhCMhPZknlVCEx1bZTpK
+/RT0dGYg+dtNMzRSHmKnqpuMFbvaHbOavYONXkRGNrcp19YXYq+vg+4osq9q1GZ8
+KbaMNF7+w27YgnbkMtmWVdIAZABSv/4a3msydX/Si5AtblaMYYCs0pAdN+TC0pY9
+qZIhAEmHEGcTqb315miP+qNUl+QjKs7gUR1m+ddo3RoPSbhpEibbyHdU0bCntUz4
+/JtmXBYCS8dqKCIVT6FLUpyZQJHkTWCKk6Xn1J/9w8lbXrYG1Z1zIX1NW4LbxkIB
+ANs4+EorZg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFEzCCA/ugAwIBAgIUN+JS0LBsAM/FnwLBPh/yh3MQtnMwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDgwNTIzMTM0
+OVoXDTE4MDgwNTIzMTM0NlowgZwxCzAJBgNVBAYTAkFVMQwwCgYDVQQIEwNWSUMx
+EDAOBgNVBAcTB0NsYXl0b24xGjAYBgNVBAoTEU1vbmFzaCBVbml2ZXJzaXR5MQ0w
+CwYDVQQLEwRNZVJDMR4wHAYDVQQDExVocGMuZXJjLm1vbmFzaC5lZHUuYXUxIjAg
+BgkqhkiG9w0BCQEWE2hlbHBAbWFzc2l2ZS5vcmcuYXUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC0e3Qvbch2hd5ldnoA6F8lzhH2h8rS8M5EMfdbyVt+
++bgNOKezHeSTrvWCqZZ/Vf/3Sv59qCCbRXgSViGQ0spd3tGGaLnXilTfNiJxdfQL
+cHY7AY9ly4YZxoCN1PGXRerOoK8U6MPTw0exewS6J09FO+682EAjJIoO4Xbg20Jl
+HumOkYhQMyxfXXKXTyovkRQcbMeRkeqwaLZm7QCSOOxLCX111j1Fler6FxIEvjA8
+gdebrnMs9EFLQ/6Em3mH8cNtkTI4hWgEdIfmi7OytQmY5JXzeb+qAzkV5GaRLaxk
+kp72Mtwrq4ibRxZeuntlF7CSrmQc3muS5WAMAuzaUVnzAgMBAAGjggGZMIIBlTBz
+BggrBgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlz
+Z2xvYmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xv
+YmFsLmNvbS9xdnNzbGcyLmNydDAgBgNVHREEGTAXghVocGMuZXJjLm1vbmFzaC5l
+ZHUuYXUwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYo
+aHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAOBgNVHQ8B
+Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQY
+MBaAFJEZYq1bF6cw+/DeOSWxvYy5uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBRq
+GtF0XctY00VnSh66rb8+fVJL2DANBgkqhkiG9w0BAQsFAAOCAQEA1yex1Ar4OE5A
+haHeC51rBaI3jRW0eAzu0DpJ3Ne6YHXScDBDhdsr/1txGhCMhPZknlVCEx1bZTpK
+/RT0dGYg+dtNMzRSHmKnqpuMFbvaHbOavYONXkRGNrcp19YXYq+vg+4osq9q1GZ8
+KbaMNF7+w27YgnbkMtmWVdIAZABSv/4a3msydX/Si5AtblaMYYCs0pAdN+TC0pY9
+qZIhAEmHEGcTqb315miP+qNUl+QjKs7gUR1m+ddo3RoPSbhpEibbyHdU0bCntUz4
+/JtmXBYCS8dqKCIVT6FLUpyZQJHkTWCKk6Xn1J/9w8lbXrYG1Z1zIX1NW4LbxkIB
+ANs4+EorZg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ContactPerson contactType="technical">
+      <Company>Monash University</Company>
+      <GivenName>Jupiter</GivenName>
+      <SurName>Hu</SurName>
+      <EmailAddress>mailto:jupiter.hu@monash.edu</EmailAddress>
+    </ContactPerson>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/SLO/Artifact" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/SLO/SOAP" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/SLO/POST" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/SLO/Redirect" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/NIM/Redirect" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/NIM/SOAP" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/NIM/POST" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/NIM/Artifact" />
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/SAML2/POST" index="1" isDefault="true" />
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpc.erc.monash.edu.au/Shibboleth.sso/SAML2/Artifact" index="3" isDefault="false" />
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">monash.edu.au</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Monash University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.monash.edu.au</OrganizationURL>
+  </Organization>
+</EntityDescriptor>
diff --git a/files/hpcdev.aaf-metadata-cert.pem b/files/hpcdev.aaf-metadata-cert.pem
new file mode 100644
index 0000000000000000000000000000000000000000..91c763753cad0e6e7bfc5c4c7ffee536336a2583
--- /dev/null
+++ b/files/hpcdev.aaf-metadata-cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsACCQD5mbHE85EJjDANBgkqhkiG9w0BAQsFADCBrTELMAkGA1UEBhMC
+QVUxETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNV
+BAoTBk1vbmFzaDENMAsGA1UECxMETWVSQzEhMB8GA1UEAxMYaHBjZGV2LmVyYy5t
+b25hc2guZWR1LmF1MRAwDgYDVQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNo
+ZWxwQG1hc3NpdmUub3JnLmF1MB4XDTE1MDgxMDAzMDAxMVoXDTI1MDgwNzAzMDAx
+MVowga0xCzAJBgNVBAYTAkFVMREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJ
+TWVsYm91cm5lMQ8wDQYDVQQKEwZNb25hc2gxDTALBgNVBAsTBE1lUkMxITAfBgNV
+BAMTGGhwY2Rldi5lcmMubW9uYXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEi
+MCAGCSqGSIb3DQEJARYTaGVscEBtYXNzaXZlLm9yZy5hdTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+HCuHKoyWnlKq4odcUXaFnOPqJ5F7vpBM/Dce2
+nht+G5B+82uirgNtVmW3vDHYR45NCXDYwg3BJp/xLe+dle9/xzsJ3qxaCl5YkeOG
+uVQyfljROo4mGghjWLA5+jFfJ4H5cvx86WT5yqCpaSRGUs9roWtcR90Tv/EDFK/o
+zaiPxEya9mfDhr0GhWMGUyvaKRWy1fSBBFDLiIPcPfJ2/HiG24i7HcO1p3XW09JC
+0D/yZpEcCOk8ckm7RRZoIZo3+8KhuAWDKT0pfRTQ7i/7Hc/sJgdasjnk42wLmeW1
+pan64/zie9HJfjKeUUkJsisZA4wqkdnps4K7osQC8QZLUfECAwEAATANBgkqhkiG
+9w0BAQsFAAOCAQEAGNPmJG9KJAD9R6V98ArWZ6l4HbOP+UKrHwudWw0HaRjAQiSF
+g2yg4LefvY7eb1JUIg3T9OPeSeYR3EJAZNbeDhXIoDA5/3yvE7q1i/15j/bWq4IS
+HL1B5qaXsNCBpN7P91SBWmcf+fBKr1Ixw7qjieOGmX+aMWhYfbJU+RHWkhn2tfGw
+x4Yj7Dl49cz3W265fytTeH2Hvyv7HAaoQSW7wSWxhvV7erRknHbOYXAWYxk50I/O
+vKY62qNrC7SecT+ephxNNw7IBPW4b2aCCf5Z2rFRCJnKeiwC3W8L7zJwHNT1IqCO
+w3fOVeHILe7sV0MESBheDmwSOjHxH2anlu449w==
+-----END CERTIFICATE-----
diff --git a/files/hpcdev.erc.monash.edu.au.crt b/files/hpcdev.erc.monash.edu.au.crt
new file mode 100644
index 0000000000000000000000000000000000000000..09e63e605db712a8c1411e166f2397adc8cb890e
--- /dev/null
+++ b/files/hpcdev.erc.monash.edu.au.crt
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+        Validity
+            Not Before: Aug  4 06:52:36 2015 GMT
+            Not After : Aug  1 06:52:36 2025 GMT
+        Subject: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=hpcdev.erc.monash.edu.au/name=EasyRSA/emailAddress=help@massive.org.au
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:9f:87:0a:e1:ca:a3:25:a7:94:aa:b8:a1:d7:14:
+                    5d:a1:67:38:fa:89:e4:5e:ef:a4:13:3f:0d:c7:b6:
+                    9e:1b:7e:1b:90:7e:f3:6b:a2:ae:03:6d:56:65:b7:
+                    bc:31:d8:47:8e:4d:09:70:d8:c2:0d:c1:26:9f:f1:
+                    2d:ef:9d:95:ef:7f:c7:3b:09:de:ac:5a:0a:5e:58:
+                    91:e3:86:b9:54:32:7e:58:d1:3a:8e:26:1a:08:63:
+                    58:b0:39:fa:31:5f:27:81:f9:72:fc:7c:e9:64:f9:
+                    ca:a0:a9:69:24:46:52:cf:6b:a1:6b:5c:47:dd:13:
+                    bf:f1:03:14:af:e8:cd:a8:8f:c4:4c:9a:f6:67:c3:
+                    86:bd:06:85:63:06:53:2b:da:29:15:b2:d5:f4:81:
+                    04:50:cb:88:83:dc:3d:f2:76:fc:78:86:db:88:bb:
+                    1d:c3:b5:a7:75:d6:d3:d2:42:d0:3f:f2:66:91:1c:
+                    08:e9:3c:72:49:bb:45:16:68:21:9a:37:fb:c2:a1:
+                    b8:05:83:29:3d:29:7d:14:d0:ee:2f:fb:1d:cf:ec:
+                    26:07:5a:b2:39:e4:e3:6c:0b:99:e5:b5:a5:a9:fa:
+                    e3:fc:e2:7b:d1:c9:7e:32:9e:51:49:09:b2:2b:19:
+                    03:8c:2a:91:d9:e9:b3:82:bb:a2:c4:02:f1:06:4b:
+                    51:f1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                Easy-RSA Generated Certificate
+            X509v3 Subject Key Identifier: 
+                71:04:1C:A3:7A:64:76:72:D4:78:62:3D:32:E2:77:A7:D0:88:30:21
+            X509v3 Authority Key Identifier: 
+                keyid:03:E5:30:69:86:6B:4A:D7:C1:96:A3:73:3A:F9:F1:8E:BB:D1:53:CF
+                DirName:/C=AU/ST=Victoria/L=Melbourne/O=Monash/OU=MeRC/CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+                serial:C5:D4:2B:DC:F1:59:18:3D
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+         47:49:e3:d9:00:20:01:76:41:e0:58:1e:fd:7c:8e:f8:65:c7:
+         d7:9e:02:ec:4b:40:ab:11:87:17:a0:4b:3a:db:5c:5f:7a:da:
+         7d:b1:d4:b4:0e:48:4e:f8:4e:4f:71:75:04:01:d2:52:bc:8b:
+         31:b5:ea:a8:46:f6:9e:72:f0:1b:62:b1:0e:6f:77:55:0e:40:
+         51:d6:34:bf:76:bc:4a:dd:58:e1:c3:e0:b3:25:52:ff:cd:bf:
+         13:52:1e:35:92:51:bc:f8:2a:2e:8e:1e:96:19:1b:fc:42:e1:
+         c4:29:63:1f:16:f8:1e:d4:93:a5:48:34:64:f7:3e:02:8d:60:
+         da:ee:fe:50:dd:0a:06:50:28:36:d0:d3:44:3a:4e:c5:2a:f4:
+         7f:2f:be:f6:f1:3f:6c:8e:fe:58:4f:b4:8f:f6:b4:93:7e:a0:
+         35:c5:07:7f:04:e4:b9:ea:6c:e3:4f:10:0b:6a:4a:c2:84:5f:
+         f7:58:49:40:80:9b:3e:c9:38:0f:18:0b:07:94:2b:50:6a:ab:
+         f2:4b:66:70:e7:47:9d:05:94:d7:0c:7f:93:62:a8:fc:3f:8a:
+         80:88:5b:68:c3:61:3c:27:e2:66:c8:9b:6b:23:43:c3:40:19:
+         3e:a7:5a:c9:71:44:f8:6c:e6:58:ae:56:c7:31:9a:cc:26:cc:
+         8d:a4:a0:6e
+-----BEGIN CERTIFICATE-----
+MIIFHzCCBAegAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCQVUx
+ETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNVBAoT
+Bk1vbmFzaDENMAsGA1UECxMETWVSQzESMBAGA1UEAxMJTW9uYXNoIENBMRAwDgYD
+VQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1
+MB4XDTE1MDgwNDA2NTIzNloXDTI1MDgwMTA2NTIzNlowga0xCzAJBgNVBAYTAkFV
+MREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQK
+EwZNb25hc2gxDTALBgNVBAsTBE1lUkMxITAfBgNVBAMTGGhwY2Rldi5lcmMubW9u
+YXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAGCSqGSIb3DQEJARYTaGVs
+cEBtYXNzaXZlLm9yZy5hdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJ+HCuHKoyWnlKq4odcUXaFnOPqJ5F7vpBM/Dce2nht+G5B+82uirgNtVmW3vDHY
+R45NCXDYwg3BJp/xLe+dle9/xzsJ3qxaCl5YkeOGuVQyfljROo4mGghjWLA5+jFf
+J4H5cvx86WT5yqCpaSRGUs9roWtcR90Tv/EDFK/ozaiPxEya9mfDhr0GhWMGUyva
+KRWy1fSBBFDLiIPcPfJ2/HiG24i7HcO1p3XW09JC0D/yZpEcCOk8ckm7RRZoIZo3
++8KhuAWDKT0pfRTQ7i/7Hc/sJgdasjnk42wLmeW1pan64/zie9HJfjKeUUkJsisZ
+A4wqkdnps4K7osQC8QZLUfECAwEAAaOCAVUwggFRMAkGA1UdEwQCMAAwLQYJYIZI
+AYb4QgENBCAWHkVhc3ktUlNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUcQQco3pkdnLUeGI9MuJ3p9CIMCEwgdMGA1UdIwSByzCByIAUA+UwaYZrStfB
+lqNzOvnxjrvRU8+hgaSkgaEwgZ4xCzAJBgNVBAYTAkFVMREwDwYDVQQIEwhWaWN0
+b3JpYTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQKEwZNb25hc2gxDTALBgNV
+BAsTBE1lUkMxEjAQBgNVBAMTCU1vbmFzaCBDQTEQMA4GA1UEKRMHRWFzeVJTQTEi
+MCAGCSqGSIb3DQEJARYTaGVscEBtYXNzaXZlLm9yZy5hdYIJAMXUK9zxWRg9MBMG
+A1UdJQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQsFAAOC
+AQEAR0nj2QAgAXZB4Fge/XyO+GXH154C7EtAqxGHF6BLOttcX3rafbHUtA5ITvhO
+T3F1BAHSUryLMbXqqEb2nnLwG2KxDm93VQ5AUdY0v3a8St1Y4cPgsyVS/82/E1Ie
+NZJRvPgqLo4elhkb/ELhxCljHxb4HtSTpUg0ZPc+Ao1g2u7+UN0KBlAoNtDTRDpO
+xSr0fy++9vE/bI7+WE+0j/a0k36gNcUHfwTkueps408QC2pKwoRf91hJQICbPsk4
+DxgLB5QrUGqr8ktmcOdHnQWU1wx/k2Ko/D+KgIhbaMNhPCfiZsibayNDw0AZPqda
+yXFE+GzmWK5WxzGazCbMjaSgbg==
+-----END CERTIFICATE-----
diff --git a/files/hpcdev.erc.monash.edu.au.key b/files/hpcdev.erc.monash.edu.au.key
new file mode 100644
index 0000000000000000000000000000000000000000..5cd68468b5b984e7d0f98a2d17fdd287cf31eda3
--- /dev/null
+++ b/files/hpcdev.erc.monash.edu.au.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQCfhwrhyqMlp5Sq
+uKHXFF2hZzj6ieRe76QTPw3Htp4bfhuQfvNroq4DbVZlt7wx2EeOTQlw2MINwSaf
+8S3vnZXvf8c7Cd6sWgpeWJHjhrlUMn5Y0TqOJhoIY1iwOfoxXyeB+XL8fOlk+cqg
+qWkkRlLPa6FrXEfdE7/xAxSv6M2oj8RMmvZnw4a9BoVjBlMr2ikVstX0gQRQy4iD
+3D3ydvx4htuIux3Dtad11tPSQtA/8maRHAjpPHJJu0UWaCGaN/vCobgFgyk9KX0U
+0O4v+x3P7CYHWrI55ONsC5nltaWp+uP84nvRyX4ynlFJCbIrGQOMKpHZ6bOCu6LE
+AvEGS1HxAgMBAAECggEBAJE7UBzfbkgJmL8T98LnN5aJcsYkY1RKtwUOkm0PREGj
+PVT/PnzvTZyxHcbczuhSDlLur3mc3I3JGnDiEP/kZ2vy2F5XTfF6x5W87JRHQtH0
+ZjJVyQlAhtK8HzHQloX8KuuZPaW/0nurLV223ZG4tAtB4WLsUEBkionQVDURrKmX
+SJ3VKkc7mB4c/a98rznulgMJVA6UqXLmBFZuLEyimZ/kkfZSrj/4xggWcao55LrM
+zG669BEsUhVK+tOwZlOfohXMayQMLfN1Px49KuySKAQGddyyhJCYc+05HMBKfNQl
+8iK4LBdhagBCtissC4Z5JSPe3llsC3DpGbGyselcq0ECgYEA1LCvsXoT2dK9SIrN
+IEa4/jVA7x3Bgx64x1ueKMEetBTuN2r7Kuyt8LG8vj/ZkQQyokv6lJNbC+PUty+S
+/vbce6/QZSkVmR1iieVO4f7++ibIM7VTcrhQZQoCBjV4cZePYl17CKGlnw5Gf0++
+KtIaQ8VVmV+6XsQFlUELTxQ8SqsCgYEAwAMK4fLyecwOw9PsLYMJWIXUCtjFKxMd
+KI+ezOznh+FxBXxDMJ1VQ5DVqnkqpESHpc7hu/SIEif9aiPiRfnmobBycZ1f9iQo
+N683CpIR819Y1YrETs1QpaCFyumIHTeMXP6UNzBbVfhIe8HQwHRd6xu8c+BcnrH9
+v2iwfpttVdMCgYEAoYinh1U+Klshoyy36eGMspTjgjfJNrpogBCXKECz/vU+jxxT
+MiCbYoi63otDxB26DwVBhQH9TiR088PQEpCOl+nJjmsLmkR1CGH97SproLU/q/X1
+MNXHSVW2f9ywYyVGouB4hu+uCAUhiaOYvJDhncML5faMZ1jdHKRP4Hlv6Q0CgYEA
+oKsrFQyM11vn0vdm/mJSlK9PUlA3FCcnVARxlfp6dtovD67+LhTI/wOXttEy3Ee3
+1ge6HeOtZLvvsjwaoAFPembCLM3KOZXhzU6hWQgHW0WiePVn9KSa4izjJ3qoegI8
+QqiH73JYSyS5ykzQ1+nHmO8Zj0DjX6uCsALzBM4b/B8CgYEAn0ITfn3Vy9WmbQ38
+1ZL2pWRpB+UFBPiR7JcEQ2dEeOLikiNoK7GqV4WpkpP6P78utvDNlGzBqEyCpXk9
+h2kSWNDffIon58J4pIZFotgBRdjAr3WR/pttlmq0o7Rrytsf8QZbiX92uPmU1XCg
+N8LpatZI0FSm/GchjmW3+8KUOsI=
+-----END PRIVATE KEY-----
diff --git a/files/hpcdev.metadata.aaf.xml b/files/hpcdev.metadata.aaf.xml
new file mode 100644
index 0000000000000000000000000000000000000000..745790834370a47c9152b69268bc1a59f7a5c0e5
--- /dev/null
+++ b/files/hpcdev.metadata.aaf.xml
@@ -0,0 +1,97 @@
+<EntityDescriptor entityID="https://hpcdev.erc.monash.edu.au/shibboleth" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <dsr:DiscoveryResponse xmlns:dsr="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/Login" index="0" isDefault="true" />
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2DCCAsACCQD5mbHE85EJjDANBgkqhkiG9w0BAQsFADCBrTELMAkGA1UEBhMC
+QVUxETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNV
+BAoTBk1vbmFzaDENMAsGA1UECxMETWVSQzEhMB8GA1UEAxMYaHBjZGV2LmVyYy5t
+b25hc2guZWR1LmF1MRAwDgYDVQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNo
+ZWxwQG1hc3NpdmUub3JnLmF1MB4XDTE1MDgxMDAzMDAxMVoXDTI1MDgwNzAzMDAx
+MVowga0xCzAJBgNVBAYTAkFVMREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJ
+TWVsYm91cm5lMQ8wDQYDVQQKEwZNb25hc2gxDTALBgNVBAsTBE1lUkMxITAfBgNV
+BAMTGGhwY2Rldi5lcmMubW9uYXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEi
+MCAGCSqGSIb3DQEJARYTaGVscEBtYXNzaXZlLm9yZy5hdTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+HCuHKoyWnlKq4odcUXaFnOPqJ5F7vpBM/Dce2
+nht+G5B+82uirgNtVmW3vDHYR45NCXDYwg3BJp/xLe+dle9/xzsJ3qxaCl5YkeOG
+uVQyfljROo4mGghjWLA5+jFfJ4H5cvx86WT5yqCpaSRGUs9roWtcR90Tv/EDFK/o
+zaiPxEya9mfDhr0GhWMGUyvaKRWy1fSBBFDLiIPcPfJ2/HiG24i7HcO1p3XW09JC
+0D/yZpEcCOk8ckm7RRZoIZo3+8KhuAWDKT0pfRTQ7i/7Hc/sJgdasjnk42wLmeW1
+pan64/zie9HJfjKeUUkJsisZA4wqkdnps4K7osQC8QZLUfECAwEAATANBgkqhkiG
+9w0BAQsFAAOCAQEAGNPmJG9KJAD9R6V98ArWZ6l4HbOP+UKrHwudWw0HaRjAQiSF
+g2yg4LefvY7eb1JUIg3T9OPeSeYR3EJAZNbeDhXIoDA5/3yvE7q1i/15j/bWq4IS
+HL1B5qaXsNCBpN7P91SBWmcf+fBKr1Ixw7qjieOGmX+aMWhYfbJU+RHWkhn2tfGw
+x4Yj7Dl49cz3W265fytTeH2Hvyv7HAaoQSW7wSWxhvV7erRknHbOYXAWYxk50I/O
+vKY62qNrC7SecT+ephxNNw7IBPW4b2aCCf5Z2rFRCJnKeiwC3W8L7zJwHNT1IqCO
+w3fOVeHILe7sV0MESBheDmwSOjHxH2anlu449w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2DCCAsACCQD5mbHE85EJjDANBgkqhkiG9w0BAQsFADCBrTELMAkGA1UEBhMC
+QVUxETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNV
+BAoTBk1vbmFzaDENMAsGA1UECxMETWVSQzEhMB8GA1UEAxMYaHBjZGV2LmVyYy5t
+b25hc2guZWR1LmF1MRAwDgYDVQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNo
+ZWxwQG1hc3NpdmUub3JnLmF1MB4XDTE1MDgxMDAzMDAxMVoXDTI1MDgwNzAzMDAx
+MVowga0xCzAJBgNVBAYTAkFVMREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJ
+TWVsYm91cm5lMQ8wDQYDVQQKEwZNb25hc2gxDTALBgNVBAsTBE1lUkMxITAfBgNV
+BAMTGGhwY2Rldi5lcmMubW9uYXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEi
+MCAGCSqGSIb3DQEJARYTaGVscEBtYXNzaXZlLm9yZy5hdTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+HCuHKoyWnlKq4odcUXaFnOPqJ5F7vpBM/Dce2
+nht+G5B+82uirgNtVmW3vDHYR45NCXDYwg3BJp/xLe+dle9/xzsJ3qxaCl5YkeOG
+uVQyfljROo4mGghjWLA5+jFfJ4H5cvx86WT5yqCpaSRGUs9roWtcR90Tv/EDFK/o
+zaiPxEya9mfDhr0GhWMGUyvaKRWy1fSBBFDLiIPcPfJ2/HiG24i7HcO1p3XW09JC
+0D/yZpEcCOk8ckm7RRZoIZo3+8KhuAWDKT0pfRTQ7i/7Hc/sJgdasjnk42wLmeW1
+pan64/zie9HJfjKeUUkJsisZA4wqkdnps4K7osQC8QZLUfECAwEAATANBgkqhkiG
+9w0BAQsFAAOCAQEAGNPmJG9KJAD9R6V98ArWZ6l4HbOP+UKrHwudWw0HaRjAQiSF
+g2yg4LefvY7eb1JUIg3T9OPeSeYR3EJAZNbeDhXIoDA5/3yvE7q1i/15j/bWq4IS
+HL1B5qaXsNCBpN7P91SBWmcf+fBKr1Ixw7qjieOGmX+aMWhYfbJU+RHWkhn2tfGw
+x4Yj7Dl49cz3W265fytTeH2Hvyv7HAaoQSW7wSWxhvV7erRknHbOYXAWYxk50I/O
+vKY62qNrC7SecT+ephxNNw7IBPW4b2aCCf5Z2rFRCJnKeiwC3W8L7zJwHNT1IqCO
+w3fOVeHILe7sV0MESBheDmwSOjHxH2anlu449w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ContactPerson contactType="technical">
+      <GivenName>Jupiter</GivenName>
+      <SurName>Hu</SurName>
+      <EmailAddress>mailto:jupiter.hu@monash.edu</EmailAddress>
+    </ContactPerson>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/SLO/Artifact" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/SLO/POST" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/SLO/SOAP" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/SLO/Redirect" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/NIM/Redirect" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/NIM/POST" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/NIM/Artifact" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/NIM/SOAP" />
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/SAML2/Artifact" index="3" isDefault="false" />
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpcdev.erc.monash.edu.au/Shibboleth.sso/SAML2/POST" index="1" isDefault="true" />
+    <AttributeConsumingService index="1" isDefault="false">
+      <ServiceName xml:lang="en">Monash University HPC dev</ServiceName>
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.3" FriendlyName="commonName" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.16.840.1.113730.3.1.241" FriendlyName="displayName" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="email" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42" FriendlyName="givenName" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.41" FriendlyName="mobileNumber" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.10" FriendlyName="organizationName" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4" FriendlyName="surname" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.20" FriendlyName="telephoneNumber" isRequired="true" />
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">monash.edu.au</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Monash University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://manager.aaf.edu.au/support</OrganizationURL>
+  </Organization>
+</EntityDescriptor>
diff --git a/files/hpctest.aaf-metadata-cert.pem b/files/hpctest.aaf-metadata-cert.pem
new file mode 100644
index 0000000000000000000000000000000000000000..79e2ffa9a28f8ce4ff1c95f4a89b60fb3e5c921c
--- /dev/null
+++ b/files/hpctest.aaf-metadata-cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID2jCCAsICCQCEsx7MqIlNPjANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UEBhMC
+QVUxETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNV
+BAoTBk1vbmFzaDENMAsGA1UECxMETWVSQzEiMCAGA1UEAxMZaHBjdGVzdC5lcmMu
+bW9uYXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAGCSqGSIb3DQEJARYT
+aGVscEBtYXNzaXZlLm9yZy5hdTAeFw0xNTA4MTAwMzIyNTVaFw0yNTA4MDcwMzIy
+NTVaMIGuMQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExEjAQBgNVBAcT
+CU1lbGJvdXJuZTEPMA0GA1UEChMGTW9uYXNoMQ0wCwYDVQQLEwRNZVJDMSIwIAYD
+VQQDExlocGN0ZXN0LmVyYy5tb25hc2guZWR1LmF1MRAwDgYDVQQpEwdFYXN5UlNB
+MSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzgN320qwQAcGOC+AHodIKVh+UFXyBE8alicw
+qdy3dm9s5OUIn+AHUoxefAAPEnS5Lk83UgvrKN8/hxqEdVHEIk08J0H1bEQT5Szh
+V4vuZbCjVKQB51T7qyi0R73iqBjAia0Zdm2jWQB5kRGfyZLPllUqpsyO3Ta3eWJO
+Q68MvIA+PKrNevNex59LTom9b0KNI8r9VL5RFvdu7kVVVTYWx5hOZyBZ0idGWq09
+rssQ4kn2eiFTqhDqk75SbweVNOXkBThw9L+hybwCDi6j04UxiR7W59DonrV0yIwU
+cbkeCw7O/gk2b4gPRPfyBnOnj5pOyeIEwrEw8nVtmWopUYYrDQIDAQABMA0GCSqG
+SIb3DQEBCwUAA4IBAQBDGYlUm8E9jGeggh3M9fVU/B0rqQTpCI3oYRRqAuM5/bS0
+kWTxxdJ1glB2N7VCoxhRwYZmiEvAV9GBBpLzPENvsvjJzeco35PYdXSTEys9kkgo
+2DDOo+mPuVO4F37scK30bkF3PtruylJLK3NjLrozvr5+PSp8WGmVDFqtahzSd4pz
+Y6e6EP6GDCA+USn/wCYR/B+Pg3Z6YvbQv1mNSlARXJ96tZCNLfl7L6rI03s5Cxxy
+sqd+XCMMLxwplMmxAn3FMANo2kh0Bs3CMTGXNR1qTlhNQED4q4FUHLQ65NEYxMZ7
+taIuQ8iJzeJVwpkG6YcBnOkrpqDeOgduIPsrOg73
+-----END CERTIFICATE-----
diff --git a/files/hpctest.erc.monash.edu.au.crt b/files/hpctest.erc.monash.edu.au.crt
new file mode 100644
index 0000000000000000000000000000000000000000..cc295bfc808c47e5a3bbaac5aea36bc983922831
--- /dev/null
+++ b/files/hpctest.erc.monash.edu.au.crt
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+        Validity
+            Not Before: Aug  5 00:13:05 2015 GMT
+            Not After : Aug  2 00:13:05 2025 GMT
+        Subject: C=AU, ST=Victoria, L=Melbourne, O=Monash, OU=MeRC, CN=hpctest.erc.monash.edu.au/name=EasyRSA/emailAddress=help@massive.org.au
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:ce:03:77:db:4a:b0:40:07:06:38:2f:80:1e:87:
+                    48:29:58:7e:50:55:f2:04:4f:1a:96:27:30:a9:dc:
+                    b7:76:6f:6c:e4:e5:08:9f:e0:07:52:8c:5e:7c:00:
+                    0f:12:74:b9:2e:4f:37:52:0b:eb:28:df:3f:87:1a:
+                    84:75:51:c4:22:4d:3c:27:41:f5:6c:44:13:e5:2c:
+                    e1:57:8b:ee:65:b0:a3:54:a4:01:e7:54:fb:ab:28:
+                    b4:47:bd:e2:a8:18:c0:89:ad:19:76:6d:a3:59:00:
+                    79:91:11:9f:c9:92:cf:96:55:2a:a6:cc:8e:dd:36:
+                    b7:79:62:4e:43:af:0c:bc:80:3e:3c:aa:cd:7a:f3:
+                    5e:c7:9f:4b:4e:89:bd:6f:42:8d:23:ca:fd:54:be:
+                    51:16:f7:6e:ee:45:55:55:36:16:c7:98:4e:67:20:
+                    59:d2:27:46:5a:ad:3d:ae:cb:10:e2:49:f6:7a:21:
+                    53:aa:10:ea:93:be:52:6f:07:95:34:e5:e4:05:38:
+                    70:f4:bf:a1:c9:bc:02:0e:2e:a3:d3:85:31:89:1e:
+                    d6:e7:d0:e8:9e:b5:74:c8:8c:14:71:b9:1e:0b:0e:
+                    ce:fe:09:36:6f:88:0f:44:f7:f2:06:73:a7:8f:9a:
+                    4e:c9:e2:04:c2:b1:30:f2:75:6d:99:6a:29:51:86:
+                    2b:0d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                Easy-RSA Generated Certificate
+            X509v3 Subject Key Identifier: 
+                B0:44:54:C2:24:13:03:24:B6:C9:C5:21:55:DB:D0:A2:70:8E:A6:AE
+            X509v3 Authority Key Identifier: 
+                keyid:5A:5D:FA:95:E7:E9:B3:D1:2C:8B:F9:E9:47:07:F8:7F:5B:D9:7B:B0
+                DirName:/C=AU/ST=Victoria/L=Melbourne/O=Monash/OU=MeRC/CN=Monash CA/name=EasyRSA/emailAddress=help@massive.org.au
+                serial:D9:29:42:7E:68:DB:1F:B5
+
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+            X509v3 Key Usage: 
+                Digital Signature
+    Signature Algorithm: sha256WithRSAEncryption
+         1a:84:a7:e3:1b:f9:2b:f8:f0:ad:c2:ae:f7:c6:d8:83:8f:f7:
+         2d:7b:4f:22:05:7e:11:3c:3e:af:d7:49:39:36:31:c3:9c:8c:
+         f5:e7:7c:90:04:da:7f:6a:8c:ec:de:2a:4d:55:83:4c:a3:43:
+         60:d2:56:5f:bc:a8:f3:0d:e3:7c:c2:30:20:e0:39:7f:48:27:
+         ad:c4:bc:60:19:b6:98:6e:39:8c:71:4b:b2:15:ca:08:28:43:
+         dd:6e:4d:29:e6:89:58:16:6e:c6:68:ca:16:db:11:61:a9:78:
+         20:d9:76:bb:d1:f9:00:a1:33:ad:1e:34:a5:ae:46:47:d3:56:
+         3c:97:71:ae:ec:b3:dd:1a:48:16:a8:e1:49:44:c5:0a:8c:1e:
+         1c:16:dc:d8:b2:b1:a0:98:9d:9b:11:5a:e3:c1:02:40:20:b9:
+         fa:36:57:ac:09:51:81:d3:82:5f:b2:93:1e:28:7a:c4:00:24:
+         f2:90:a1:ab:23:b5:2b:b6:97:67:df:39:51:5d:66:a6:01:d7:
+         6c:6d:d5:d7:5b:63:66:d6:a2:a7:21:bb:3d:1c:44:07:18:a0:
+         a9:60:77:7a:8c:85:79:47:48:c3:9b:05:05:e7:e9:f3:e3:15:
+         00:25:e4:59:32:eb:36:57:84:2c:30:f3:0d:3b:24:a4:0c:3c:
+         d4:5d:13:4b
+-----BEGIN CERTIFICATE-----
+MIIFIDCCBAigAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCQVUx
+ETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNVBAoT
+Bk1vbmFzaDENMAsGA1UECxMETWVSQzESMBAGA1UEAxMJTW9uYXNoIENBMRAwDgYD
+VQQpEwdFYXN5UlNBMSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1
+MB4XDTE1MDgwNTAwMTMwNVoXDTI1MDgwMjAwMTMwNVowga4xCzAJBgNVBAYTAkFV
+MREwDwYDVQQIEwhWaWN0b3JpYTESMBAGA1UEBxMJTWVsYm91cm5lMQ8wDQYDVQQK
+EwZNb25hc2gxDTALBgNVBAsTBE1lUkMxIjAgBgNVBAMTGWhwY3Rlc3QuZXJjLm1v
+bmFzaC5lZHUuYXUxEDAOBgNVBCkTB0Vhc3lSU0ExIjAgBgkqhkiG9w0BCQEWE2hl
+bHBAbWFzc2l2ZS5vcmcuYXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDOA3fbSrBABwY4L4Aeh0gpWH5QVfIETxqWJzCp3Ld2b2zk5Qif4AdSjF58AA8S
+dLkuTzdSC+so3z+HGoR1UcQiTTwnQfVsRBPlLOFXi+5lsKNUpAHnVPurKLRHveKo
+GMCJrRl2baNZAHmREZ/Jks+WVSqmzI7dNrd5Yk5Drwy8gD48qs16817Hn0tOib1v
+Qo0jyv1UvlEW927uRVVVNhbHmE5nIFnSJ0ZarT2uyxDiSfZ6IVOqEOqTvlJvB5U0
+5eQFOHD0v6HJvAIOLqPThTGJHtbn0OietXTIjBRxuR4LDs7+CTZviA9E9/IGc6eP
+mk7J4gTCsTDydW2ZailRhisNAgMBAAGjggFVMIIBUTAJBgNVHRMEAjAAMC0GCWCG
+SAGG+EIBDQQgFh5FYXN5LVJTQSBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFLBEVMIkEwMktsnFIVXb0KJwjqauMIHTBgNVHSMEgcswgciAFFpd+pXn6bPR
+LIv56UcH+H9b2XuwoYGkpIGhMIGeMQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmlj
+dG9yaWExEjAQBgNVBAcTCU1lbGJvdXJuZTEPMA0GA1UEChMGTW9uYXNoMQ0wCwYD
+VQQLEwRNZVJDMRIwEAYDVQQDEwlNb25hc2ggQ0ExEDAOBgNVBCkTB0Vhc3lSU0Ex
+IjAgBgkqhkiG9w0BCQEWE2hlbHBAbWFzc2l2ZS5vcmcuYXWCCQDZKUJ+aNsftTAT
+BgNVHSUEDDAKBggrBgEFBQcDAjALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQAD
+ggEBABqEp+Mb+Sv48K3CrvfG2IOP9y17TyIFfhE8Pq/XSTk2McOcjPXnfJAE2n9q
+jOzeKk1Vg0yjQ2DSVl+8qPMN43zCMCDgOX9IJ63EvGAZtphuOYxxS7IVyggoQ91u
+TSnmiVgWbsZoyhbbEWGpeCDZdrvR+QChM60eNKWuRkfTVjyXca7ss90aSBao4UlE
+xQqMHhwW3NiysaCYnZsRWuPBAkAgufo2V6wJUYHTgl+ykx4oesQAJPKQoasjtSu2
+l2ffOVFdZqYB12xt1ddbY2bWoqchuz0cRAcYoKlgd3qMhXlHSMObBQXn6fPjFQAl
+5Fky6zZXhCww8w07JKQMPNRdE0s=
+-----END CERTIFICATE-----
diff --git a/files/hpctest.erc.monash.edu.au.key b/files/hpctest.erc.monash.edu.au.key
new file mode 100644
index 0000000000000000000000000000000000000000..d07f6992ec6abace49ae20fe5fa62c5be20c796e
--- /dev/null
+++ b/files/hpctest.erc.monash.edu.au.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOA3fbSrBABwY4
+L4Aeh0gpWH5QVfIETxqWJzCp3Ld2b2zk5Qif4AdSjF58AA8SdLkuTzdSC+so3z+H
+GoR1UcQiTTwnQfVsRBPlLOFXi+5lsKNUpAHnVPurKLRHveKoGMCJrRl2baNZAHmR
+EZ/Jks+WVSqmzI7dNrd5Yk5Drwy8gD48qs16817Hn0tOib1vQo0jyv1UvlEW927u
+RVVVNhbHmE5nIFnSJ0ZarT2uyxDiSfZ6IVOqEOqTvlJvB5U05eQFOHD0v6HJvAIO
+LqPThTGJHtbn0OietXTIjBRxuR4LDs7+CTZviA9E9/IGc6ePmk7J4gTCsTDydW2Z
+ailRhisNAgMBAAECggEADI4Vjd29ZAmJjX8HldS0xyBHgmnad/zCKAh3ZMK4w5UC
+0+hJYETs7VD0qSXvxTYr2vCk9HEZgcIpQviQvf2fsF94nQPeCx0TAVJ84TL78mKT
+caMVIp4BQGsYoY6m84ueoEVWWetQmyn2PqsOS+CQmh7SnJu20TB2egVNs75FTm9+
+VSza7ioK259kLv6Ibyn85Q6y3WFQbv0Wxn6rGGN2N1/tbUj75C/IvH6GgAODI3GF
+VDVaN8WMjpQUJ55q8pOEJGeMN3MOs7HXN26dqBWlEI8ZwW3h612fYhXI9HhYOMEs
+XZjUc4/cES745+FlVgitkdvMAR7FCqsEp/zIvx+2QQKBgQDxHXQ8b2+EaRUL97dg
+LMtSpL6u+qJIjzHvjP4TZosVzNtY+CFMy85TNydkoOn46poBK5oszmaKqBb6mTwl
+4ktMKYq1I6P+RFWoUUK3n9vUy2F8vB4x/xuPGcc1nbtR6GcNXwUlYd8DAzFvruYC
+Zx/W9ibghu+ygp0mndZFxb646QKBgQDau0Z0pi5IggiHfJewWQAiVEIGC+aWzexa
+3zLmuEdcEg9VwadrjkCIuKhlY+VAB8wcbDmRcScVsGNarLyHOx1udQQ5QM9aybEH
+Oo+N74IP0A+A2c5x1RYyGqHOqNXioHNhz+ihX21VhBzG3sbefyKuh+G8d5Jv2+g3
+aDFDDh8KhQKBgQDMmLy4R6ruRajJVfMx1fDV+NuhaSXpwjCSYCZ82eetoP6D+VFw
+dARpEoUH24+OW6xAz/nsiVvzznxpOzwRvXs9boa3/D09FklFIWcmn6yPXeEkUhCh
+RiLhg/NJaMW51CYV74pTVUBCsyPw7A1a/pzC8G6+2WFuLW0iho56+DhFeQKBgEvD
+CkhlNyrOP34OXcwrR6ycWrIVdS1O7ksbfFoGAlGVv9IIXaEXiKrSqyFTVJi1GrHN
+mrMR6mPM0N0bb8G3bB5SUcAy/p+HtNW4JvkWuIoZmwUabDNph2KbbuhR+qOgx9Zd
+WUpr70brl7wade+jQbQKRNou4H32QZzPbiC3x3CxAoGBAIWjoxfUKpIuPxI8mvM3
+hxR3IF9sEJ3xTXdgcfCABJ133WrwM08AnD00tJ4eiXluQranndUWwZd5/ltFbZLd
+HlPIqSA9kq9+MwCzfjOTITYgn3xCmDEUXGpR8jVXKZ9wL5vcklzDAsODLqlI/kUW
+2Ttvghy/9nrVc/Bim6KJonjO
+-----END PRIVATE KEY-----
diff --git a/files/hpctest.metadata.aaf.xml b/files/hpctest.metadata.aaf.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51cf77fdba0224cbdc5929af0dd872e6a609a6ce
--- /dev/null
+++ b/files/hpctest.metadata.aaf.xml
@@ -0,0 +1,100 @@
+<EntityDescriptor entityID="https://hpctest.erc.monash.edu.au/shibboleth" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <dsr:DiscoveryResponse xmlns:dsr="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/Login" index="0" isDefault="true" />
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2jCCAsICCQCEsx7MqIlNPjANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UEBhMC
+QVUxETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNV
+BAoTBk1vbmFzaDENMAsGA1UECxMETWVSQzEiMCAGA1UEAxMZaHBjdGVzdC5lcmMu
+bW9uYXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAGCSqGSIb3DQEJARYT
+aGVscEBtYXNzaXZlLm9yZy5hdTAeFw0xNTA4MTAwMzIyNTVaFw0yNTA4MDcwMzIy
+NTVaMIGuMQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExEjAQBgNVBAcT
+CU1lbGJvdXJuZTEPMA0GA1UEChMGTW9uYXNoMQ0wCwYDVQQLEwRNZVJDMSIwIAYD
+VQQDExlocGN0ZXN0LmVyYy5tb25hc2guZWR1LmF1MRAwDgYDVQQpEwdFYXN5UlNB
+MSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzgN320qwQAcGOC+AHodIKVh+UFXyBE8alicw
+qdy3dm9s5OUIn+AHUoxefAAPEnS5Lk83UgvrKN8/hxqEdVHEIk08J0H1bEQT5Szh
+V4vuZbCjVKQB51T7qyi0R73iqBjAia0Zdm2jWQB5kRGfyZLPllUqpsyO3Ta3eWJO
+Q68MvIA+PKrNevNex59LTom9b0KNI8r9VL5RFvdu7kVVVTYWx5hOZyBZ0idGWq09
+rssQ4kn2eiFTqhDqk75SbweVNOXkBThw9L+hybwCDi6j04UxiR7W59DonrV0yIwU
+cbkeCw7O/gk2b4gPRPfyBnOnj5pOyeIEwrEw8nVtmWopUYYrDQIDAQABMA0GCSqG
+SIb3DQEBCwUAA4IBAQBDGYlUm8E9jGeggh3M9fVU/B0rqQTpCI3oYRRqAuM5/bS0
+kWTxxdJ1glB2N7VCoxhRwYZmiEvAV9GBBpLzPENvsvjJzeco35PYdXSTEys9kkgo
+2DDOo+mPuVO4F37scK30bkF3PtruylJLK3NjLrozvr5+PSp8WGmVDFqtahzSd4pz
+Y6e6EP6GDCA+USn/wCYR/B+Pg3Z6YvbQv1mNSlARXJ96tZCNLfl7L6rI03s5Cxxy
+sqd+XCMMLxwplMmxAn3FMANo2kh0Bs3CMTGXNR1qTlhNQED4q4FUHLQ65NEYxMZ7
+taIuQ8iJzeJVwpkG6YcBnOkrpqDeOgduIPsrOg73
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2jCCAsICCQCEsx7MqIlNPjANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UEBhMC
+QVUxETAPBgNVBAgTCFZpY3RvcmlhMRIwEAYDVQQHEwlNZWxib3VybmUxDzANBgNV
+BAoTBk1vbmFzaDENMAsGA1UECxMETWVSQzEiMCAGA1UEAxMZaHBjdGVzdC5lcmMu
+bW9uYXNoLmVkdS5hdTEQMA4GA1UEKRMHRWFzeVJTQTEiMCAGCSqGSIb3DQEJARYT
+aGVscEBtYXNzaXZlLm9yZy5hdTAeFw0xNTA4MTAwMzIyNTVaFw0yNTA4MDcwMzIy
+NTVaMIGuMQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExEjAQBgNVBAcT
+CU1lbGJvdXJuZTEPMA0GA1UEChMGTW9uYXNoMQ0wCwYDVQQLEwRNZVJDMSIwIAYD
+VQQDExlocGN0ZXN0LmVyYy5tb25hc2guZWR1LmF1MRAwDgYDVQQpEwdFYXN5UlNB
+MSIwIAYJKoZIhvcNAQkBFhNoZWxwQG1hc3NpdmUub3JnLmF1MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzgN320qwQAcGOC+AHodIKVh+UFXyBE8alicw
+qdy3dm9s5OUIn+AHUoxefAAPEnS5Lk83UgvrKN8/hxqEdVHEIk08J0H1bEQT5Szh
+V4vuZbCjVKQB51T7qyi0R73iqBjAia0Zdm2jWQB5kRGfyZLPllUqpsyO3Ta3eWJO
+Q68MvIA+PKrNevNex59LTom9b0KNI8r9VL5RFvdu7kVVVTYWx5hOZyBZ0idGWq09
+rssQ4kn2eiFTqhDqk75SbweVNOXkBThw9L+hybwCDi6j04UxiR7W59DonrV0yIwU
+cbkeCw7O/gk2b4gPRPfyBnOnj5pOyeIEwrEw8nVtmWopUYYrDQIDAQABMA0GCSqG
+SIb3DQEBCwUAA4IBAQBDGYlUm8E9jGeggh3M9fVU/B0rqQTpCI3oYRRqAuM5/bS0
+kWTxxdJ1glB2N7VCoxhRwYZmiEvAV9GBBpLzPENvsvjJzeco35PYdXSTEys9kkgo
+2DDOo+mPuVO4F37scK30bkF3PtruylJLK3NjLrozvr5+PSp8WGmVDFqtahzSd4pz
+Y6e6EP6GDCA+USn/wCYR/B+Pg3Z6YvbQv1mNSlARXJ96tZCNLfl7L6rI03s5Cxxy
+sqd+XCMMLxwplMmxAn3FMANo2kh0Bs3CMTGXNR1qTlhNQED4q4FUHLQ65NEYxMZ7
+taIuQ8iJzeJVwpkG6YcBnOkrpqDeOgduIPsrOg73
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ContactPerson contactType="technical">
+      <GivenName>Jupiter</GivenName>
+      <SurName>Hu</SurName>
+      <EmailAddress>mailto:jupiter.hu@monash.edu</EmailAddress>
+    </ContactPerson>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/SLO/Redirect" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/SLO/SOAP" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/SLO/Artifact" />
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/SLO/POST" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/NIM/SOAP" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/NIM/POST" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/NIM/Redirect" />
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/NIM/Artifact" />
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/SAML2/Artifact" index="3" isDefault="false" />
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hpctest.erc.monash.edu.au/Shibboleth.sso/SAML2/POST" index="1" isDefault="true" />
+    <AttributeConsumingService index="1" isDefault="false">
+      <ServiceName xml:lang="en">Monash University HPC test</ServiceName>
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.3" FriendlyName="commonName" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.16.840.1.113730.3.1.241" FriendlyName="displayName" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="email" isRequired="true" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42" FriendlyName="givenName" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.41" FriendlyName="mobileNumber" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.10" FriendlyName="organizationName" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.11" FriendlyName="organizationalUnit" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4" FriendlyName="surname" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.20" FriendlyName="telephoneNumber" isRequired="false" />
+      <RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.10" FriendlyName="topLevelOrg" isRequired="false" />
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">monash.edu.au</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Monash University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://manager.aaf.edu.au/support</OrganizationURL>
+  </Organization>
+</EntityDescriptor>
+
diff --git a/roles/certificates/tasks/main.yml b/roles/certificates/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3ae95fb6fe0792f14aeb4a34aacbcdb93d0d3505
--- /dev/null
+++ b/roles/certificates/tasks/main.yml
@@ -0,0 +1,25 @@
+---
+- name: "Check shibbolenth directory"
+  file: dest=/etc/shibboleth state=directory mode=0655
+  sudo: true
+  when: shibbolenth_file is defined
+
+- name: "Copying the shisbbolenth files"
+  template: src="../../../files/{{ item }}" dest="/etc/shibboleth/{{ item }}" mode=0644
+  sudo: true
+  with_items:
+    - "{{ shibbolenth_file.aaf }}"
+    - "{{ shibbolenth_file.cert }}"
+  when: shibbolenth_file is defined
+
+- name: "Copying the apache key file"
+  template: src="../../../files/{{ apache_key_file }}" dest="{{ x509_key_file }}" mode=0644
+  sudo: true
+  when: apache_key_file is defined
+
+- name: "Copying the apache cert file"
+  template: src="../../../files/{{ apache_cert_file }}" dest="{{ x509_cert_file }}" mode=0644
+  sudo: true
+  when: apache_cert_file is defined
+
+
diff --git a/roles/certificates/vars/readme.txt b/roles/certificates/vars/readme.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5a25d5e4b40372309a0505c933369fc782d743b4
--- /dev/null
+++ b/roles/certificates/vars/readme.txt
@@ -0,0 +1,5 @@
+pache_cert_file: "{{ inventory_hostname }}.{{ domain }}.crt"
+apache_key_file: "{{ inventory_hostname }}.{{ domain }}.key"
+ 
+shibbolenth_file: {aaf: "{{ inventory_hostname }}.metadata.aaf.xml", cert: "{{ inventory_hostname }}.aaf-metadata-cert.pem" }
+
diff --git a/roles/shibboleth-sp/tasks/shibbolethConfig.yml b/roles/shibboleth-sp/tasks/shibbolethConfig.yml
index 00c0b6348ef9394324471d628ddd919d39e000b8..4485997da05275994336129c3665bfdc348ec984 100644
--- a/roles/shibboleth-sp/tasks/shibbolethConfig.yml
+++ b/roles/shibboleth-sp/tasks/shibbolethConfig.yml
@@ -1,11 +1,11 @@
 ---
 -
- name: "Copying the metadata.aaf.xml and aaf-metadata-cert.pem"
- template: src="{{ item }}.j2" dest="/etc/shibboleth/{{ item }}" mode=0644
- sudo: true
+ name: "Check the metadata.aaf.xml and aaf-metadata-cert.pem"
+ shell: ls /etc/shibboleth/*{{ item }}
  with_items:
-  - metadata.aaf.xml
-  - aaf-metadata-cert.pem
+   - metadata.aaf.xml
+   - aaf-metadata-cert.pem
+
 - 
   name: "Setting shibboleth2.xml sp.example.org"
   sudo: true
@@ -112,15 +112,9 @@
 -
  name: "Starting Apache"
  sudo: true
- service:
- args:
-  name: apache2
-  state: started
+ service: name=apache2 state=started
 
 -
  name: "Starting shibboleth"
  sudo: true
- service:
- args:
-  name: shibd
-  state: started
+ service: name=shibd state=started