diff --git a/.docker/docker-compose.backend-only.yml b/.docker/docker-compose.backend-only.yml
index 49099485..b5dcc1ff 100644
--- a/.docker/docker-compose.backend-only.yml
+++ b/.docker/docker-compose.backend-only.yml
@@ -13,6 +13,7 @@ services:
       - ASPNETCORE_Kestrel__Certificates__Default__Password=MyCertificatePassword
       - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/localhost.pfx
       - PersistenceModule__DefaultConnection=Server=sql1;User Id=sa;Password=<YourStrong!Passw0rd>;Database=Accounts;
+      - AuthenticationModule__AuthorityUrl=https://localhost:5000
     volumes:
       - ../.docker/https:/https:ro
     depends_on:
@@ -40,7 +41,7 @@ services:
       - ASPNETCORE_Kestrel__Certificates__Default__Password=MyCertificatePassword
       - ASPNETCORE_Kestrel__Certificates__Default__Path=/https/localhost.pfx
       - IDENTITY_SERVER_ORIGIN=https://localhost:5000
-      - RedirectUris=https://localhost:5002/callback
+      - RedirectUris=https://localhost:5002/signin-oidc
       - PostLogoutRedirectUris=https://localhost:5002
       - AllowedCorsOrigins=https://localhost:5002
     volumes:
diff --git a/.docker/docker-compose.override.yml b/.docker/docker-compose.override.yml
index b583f59b..f19d3327 100644
--- a/.docker/docker-compose.override.yml
+++ b/.docker/docker-compose.override.yml
@@ -8,11 +8,12 @@ services:
   accounts-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
+      - AuthenticationModule__AuthorityUrl=https://wallet.local:8081
   identity-server:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - IDENTITY_SERVER_ORIGIN=https://wallet.local:8081
-      - RedirectUris=https://wallet.local:8081/callback
+      - RedirectUris=https://wallet.local:8081/signin-oidc
       - PostLogoutRedirectUris=https://wallet.local:8081
       - AllowedCorsOrigins=https://wallet.local:8081
   wallet-spa:
diff --git a/.docker/docker-compose.production.yml b/.docker/docker-compose.production.yml
index fac5c63c..362506da 100644
--- a/.docker/docker-compose.production.yml
+++ b/.docker/docker-compose.production.yml
@@ -8,13 +8,14 @@ services:
   accounts-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
+      - AuthenticationModule__AuthorityUrl=https://wallet.local
   identity-server:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - IDENTITY_SERVER_ORIGIN=https://wallet.local
-      - RedirectUris=https://wallet.local/callback
+      - RedirectUris=https://wallet.local/signin-oidc
       - PostLogoutRedirectUris=https://wallet.local
-      - AllowedCorsOrigins=https://wallet.local
+      - AllowedCorsOrigins=https://wallet.local      
   wallet-spa:
     build:
       args:
diff --git a/.docker/https/localhost.crt b/.docker/https/localhost.crt
index 004c73fe..86585ade 100644
--- a/.docker/https/localhost.crt
+++ b/.docker/https/localhost.crt
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDHzCCAgegAwIBAgIJAKWhvuT1UDYyMA0GCSqGSIb3DQEBCwUAMDsxFTATBgNV
+MIIDHzCCAgegAwIBAgIJAOIxgeyqdwODMA0GCSqGSIb3DQEBCwUAMDsxFTATBgNV
 BAMTDHdhbGxldC5sb2NhbDEVMBMGA1UEChMMd2FsbGV0LmxvY2FsMQswCQYDVQQG
-EwJVUzAeFw0yMDEwMDUyMjIyNTZaFw0yMTEwMDUyMjIyNTZaMDsxFTATBgNVBAMT
+EwJVUzAeFw0yMDExMDQxOTA2MjFaFw0yMTExMDQxOTA2MjFaMDsxFTATBgNVBAMT
 DHdhbGxldC5sb2NhbDEVMBMGA1UEChMMd2FsbGV0LmxvY2FsMQswCQYDVQQGEwJV
-UzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/q0tioC5QTkYWUEbZo
-b5cEuqLXbkGt8Rab4lSCCwB4vLGhLptumvpue8p4D/Yt45dswt/lETygm5LkgXHk
-SpY+LOX03lLfIvWurkGnFLHdYtnZFHXCYMIDKE2/SR9iKxMQ3mk8Vp+hcmJpcOYQ
-4Ry1zpsjX93GZqQhYXdcW5tPwCaxRF/UGvCsS3mBES9jnT9rs3n4TsxyQSO/RosJ
-/RFZXMLIRluZDj9gFpxL7ulO9JTW8O3yRUU+BMgQr1Z/mNkohlzNUGNcn4IPBU7g
-Grq/bmkvqv1lIHGpl8cVMH+kjYkzRNtosxUrUx4iOJDVQHVLpwDZwR4B77Zy5xcZ
-02cCAwEAAaMmMCQwIgYDVR0RBBswGYIMd2FsbGV0LmxvY2Fsgglsb2NhbGhvc3Qw
-DQYJKoZIhvcNAQELBQADggEBAKiMP0MdInQVed8xreeaNRBH9Zqk7RG27f9VJX/O
-ww8UetPJYaCpgKQBoqqESb7yanSAbgoeBCNlkE8VusRm22vlmi/pMGHXIwk/HDTa
-md6aLs3gcHPaTNGArsD1+BYY0IEqyigp4H3J0w0h0Cz/hDJFTcGZp3m5+XjvrBtm
-3bdeeY/5MGmVIDTLYkvvUxziZ9G3AWKKDVhZ8YxWCJE1veVra2V45Ot5R+jhVkfd
-Zzl9ce61V5Z5l1bwb+zHs51o607adLwOm+bv5P3Am85caYO0Y+m9JnVtleZMWumh
-ryjpaPBiMg/zuyKp1+HptcAOKq2b0rVQr56LHtMbYqsXWmU=
+UzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6bLoCWRMmgIOxwEFc6
+b3eblbixOvohTTqwfgjwOYfIWgrNad9shcVa8vpI+GIETtuTUvlSUoIE/ZhhbtbA
+tPOPWvH/10ss9LX4HXcm/vPzw2CIka0uT9gnvuTmNF21+c/jVaUmKjkiOMwEBbd8
+5SyyX4m+N6swePjiSnZMEdEx5raQZ1Ubcqh2OmXkJJPG5O1jP3IzqcZA7rDP8Pd1
+jJHvej7LqX8U8EYj+v3laqBZcnHgDn4/rcf+c+FwLEErqPoFsahsGUiyMW6n1kHg
+eG8ihO57FJff4QJKWpethZlEHcqa5MNIJn6Vs0irBlQfErWcsQ78YZM3uSWBI2rR
+bHcCAwEAAaMmMCQwIgYDVR0RBBswGYIMd2FsbGV0LmxvY2Fsgglsb2NhbGhvc3Qw
+DQYJKoZIhvcNAQELBQADggEBAJdNAuDjkna4kuCSsbMBT8xWlxTN5lbDVfUIzgW4
+Iv0qb3YVqYLEbE6o/9AaE70XMMWraSnqs4j2aa5TunbQJlrTQLU45hGci1yZKeuq
+JoJtk8lUseWPzGATX7YSeQVLBUQVEmkO1UbQPr/xr0VdgkXffMNJdfDJvqykDbZn
+vGMTLvptOuj+sA1JthJo5zjwAOzf85znxFWsRYQjYO8pmK795pxN6jpeWYtBZOXA
+pva0kdRugSujjsr9XleB+T/lBWNy5b0QTFbwSc/6SKO3nV02m18ezrWtFiQ/nxYf
+Ha6ToutxjhP2YmfTGRaHvnyXMyxr1/Jkg3hVVP8xcwbcYZs=
 -----END CERTIFICATE-----
diff --git a/.docker/https/localhost.key b/.docker/https/localhost.key
index 2b3b8322..e05f1f95 100644
--- a/.docker/https/localhost.key
+++ b/.docker/https/localhost.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCv6tLYqAuUE5GF
-lBG2aG+XBLqi125BrfEWm+JUggsAeLyxoS6bbpr6bnvKeA/2LeOXbMLf5RE8oJuS
-5IFx5EqWPizl9N5S3yL1rq5BpxSx3WLZ2RR1wmDCAyhNv0kfYisTEN5pPFafoXJi
-aXDmEOEctc6bI1/dxmakIWF3XFubT8AmsURf1BrwrEt5gREvY50/a7N5+E7MckEj
-v0aLCf0RWVzCyEZbmQ4/YBacS+7pTvSU1vDt8kVFPgTIEK9Wf5jZKIZczVBjXJ+C
-DwVO4Bq6v25pL6r9ZSBxqZfHFTB/pI2JM0TbaLMVK1MeIjiQ1UB1S6cA2cEeAe+2
-cucXGdNnAgMBAAECggEBAKdI5YHTo1cHmL1uxb0w6NSyUYyi0h0w/G7kg8Ca/T1Q
-kxdTUA/MiSGWSK+LppoSnzeS3Gmu2cpObEKuew3D6s2eiHGQfo5N1F/O4bRa3woY
-nXTNwnANDJfSCtSMD0wBvTZfNzDZiQI5s50z6YFOEdOMa9EJPZOWpGp1t8qakB5K
-j7CbWkEWD96Odb0Rl5XFzyS89pms4ZLgw88sqE45RfIpKFXgwxvGqoRVsp4RbeZg
-UjpP1Actkp9YtZezeczPc1dc9/GfDB+eMjH7f1GglLkc0oPMU3djbKXJe82R8tgd
-pbNsKm/D710uZlPqhuAYvux8qb/3ZDq/fQM+fsGoN/ECgYEA1YgYvQVhdnrMwrdR
-QXti5XvKksdvte5vxjosXj53v+Mjok6sWbGSWLis75fyq1WUcGyVzMrypC78jnSI
-YwalKQGgLkSMvI7IrRDC2FDe8sLxoI6ApgDwI4zTR3AerWbqaUUcjFoN59auu6tP
-9cuGWU0Mguh77+7UF5cy0gACMS8CgYEA0ueaWmeDaRagBdmh7SzC4UAXEpSbRizA
-AnLGf7yHtLspzSwoNfoyyMEuYaXoKTGVv8/MMRN+TijjHYXgfFKCjPZvHOuCsWdP
-YHwYElYe3skJ9KU50ujZ39njscrGL8hbT4EHKkpoXY3RGkePF21ZpyQO9LjLbYu4
-T0sk0KZtw0kCgYBNWWt8rUJM5NbfggBRNBzy/BC5cr0oriKXL+N6kC5YuDLkTJNq
-OkTFFsCuWeBx6CJJR0xMTwfuKYcbI2N0W6fgXtJjcDl65E4VQwkRytm4Hp3ghz5a
-4+QZPJ4cNqUmMy2ezIY24ThATygkmz3vz7XvC1YI5aZfl6gEk6S5JX+lyQKBgGRR
-X90ioaIp7eH6fAg5o1TLTG49G4KMpKRFfd+iiJZR9HcwSswp/1/4a5xs8votKMK9
-D65ETG7XCfiwBnB8OrbcPUvvRhImRt5pCHYoWrSzwbWJpfCJa6ELnj+iaRSvY6d0
-gzj9fZkKbOzoHssQ63USNL7462Jm9DtbTd6lW05pAoGAZ/0GTnPWNYPvDKUkd/D/
-PQSC4MTJgS98TI68KtpVpOddU9olLwNQx+lpzKMbFrUAdJ9lfgFtarXKRdlGcV/L
-uCGJUhhTqnNt2byFuaFfr8BIsHTCZUDgHy7cRxBk9aFGbq507gbS+QPI1Fy+do7L
-1UNXzCEsxhMo3XFwVMklxKE=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCemy6AlkTJoCDs
+cBBXOm93m5W4sTr6IU06sH4I8DmHyFoKzWnfbIXFWvL6SPhiBE7bk1L5UlKCBP2Y
+YW7WwLTzj1rx/9dLLPS1+B13Jv7z88NgiJGtLk/YJ77k5jRdtfnP41WlJio5IjjM
+BAW3fOUssl+JvjerMHj44kp2TBHRMea2kGdVG3Kodjpl5CSTxuTtYz9yM6nGQO6w
+z/D3dYyR73o+y6l/FPBGI/r95WqgWXJx4A5+P63H/nPhcCxBK6j6BbGobBlIsjFu
+p9ZB4HhvIoTuexSX3+ECSlqXrYWZRB3KmuTDSCZ+lbNIqwZUHxK1nLEO/GGTN7kl
+gSNq0Wx3AgMBAAECggEAZbHwhihToMgYdCGCiLuCHznWLR8ORrU1lIz3svl8mdBf
+049T9BrcRueC5fIFuKs0eNuklxIurwlOJPdMH0xeedCQKpy1SZFgspCNLAoH7Rl+
+S5Yledo4/cq2PoRQTUnSDHaiQosPBaUor79gfv8I3rjcQzCA9zXUSxilT+aEghGv
+dCgCmnldOTl4vRkVhMVe8b6+O+WDOPSlLVNGffXTUUTTlt7yLytp3CY5J+0wqoHf
+4M+UzgoTf0DlaUDhu65xd6S70gPo85QRrGJX8XOUmI5OKUUNFXOKf3MJAl2qf5tQ
+1h2zS8OvWvrZL2DbBlNeJ+4hfG0fiQGgVr+i8HdpqQKBgQDO0kAeotG+nMMcTk4z
+TmLK9JK1WuMGUQqMImtwlfAKvvAAOafXmjZXxCg7gyngqhNWW6/x0CsTbdfLOk3o
+KdpkKIIAp55SHlSJJ37ELNqxLC32kvhGrQVMpR22lpemyqG2opvSHh7IjnWqhzwt
+SegxLKrfeNWb68go/5Tm3hRsVQKBgQDEUfOzz//tv1LfkhIABviZsawBMhRclBUX
+IQRGxAGGMRW7dtjwwBGsKGEBIlIROQKyf6vjsim4pxfO3kdRmzGuDe3xSIwPzLqO
+PkclUpANdHeWs0SHH4E85G+iOQ5uvufNcQa7+xw/7g1ztv8wCpiGEjAQ8SJ3E3+E
+NIUUT2mBmwKBgQCLZdKp03wjSW2ISo8SraaQvL+VVKjnvP+q7BgWTjj4RTFmNXYX
+L22pQiEL26ACOR/HeQzhozklY0erRqTz8iGsmFDnOBLRrnez6dbbSpAsEmb4Zp7I
+pB2KR0/7nQyh8rmEa50yxfJhowNT6Mp6i/HgEwcokD0JVqYWXA10fgKt8QKBgAKY
+3vN7BfS8Ojlw8kID1Zga7J6bbf+HifvjWO4iu65tyc7QFLCiqdkwM5BTRuipa2q3
+G6wIeFrUAxGeiS0AM5kM4B/4CLpQyAsHseNBg1xaNRbOSlLLTOdkUkHAJXu7lM93
+9lHYUZha6tykCB43lar4ZKBkwEL5BA/YrgYFwuyPAoGBAJHOGbBVaUPYICFtq4VP
+zDH80ogxpXf50iswHCYBLIm1YvfQY3IHQjDc3EzVUl1xxbjV7AIpv5bkqdwXQQPb
+nklsJZTLe2nkcR7hQtQ6FAloppSso1/hjxszyTkg2CUvkeKKKlL2DjP+jU1rV9ye
+DZx4GWo1PLU/MJC68JUqJSig
 -----END PRIVATE KEY-----
diff --git a/.docker/https/localhost.pfx b/.docker/https/localhost.pfx
index bc97c861..65aae547 100644
Binary files a/.docker/https/localhost.pfx and b/.docker/https/localhost.pfx differ
diff --git a/wallet-spa/.env.docker b/wallet-spa/.env.docker
index 5cc37646..9a9d48a3 100644
--- a/wallet-spa/.env.docker
+++ b/wallet-spa/.env.docker
@@ -1,6 +1,14 @@
-REACT_APP_AUTHORITY=https://wallet.local:8081/identity-server
-REACT_APP_REDIRECT_URI=https://wallet.local:8081/callback
-REACT_APP_POST_LOGOUT_REDIRECT_URI=https://wallet.local:8081
-REACT_APP_ACCOUNTS_API=https://wallet.local:8081/accounts-api
 HTTPS=false
-PORT=3000
\ No newline at end of file
+PORT=3000
+REACT_APP_ACCOUNTS_API=https://wallet.local:8081/accounts-api
+REACT_APP_AUDIENCE=https://wallet.local:8081/identity-server
+REACT_APP_AUTH_URL=https://wallet.local:8081/identity-server
+REACT_APP_AUTHORITY=https://wallet.local:8081/identity-server
+REACT_APP_IDENTITY_CLIENT_ID=spa
+REACT_APP_ISSUER=https://wallet.local:8081/identity-server
+REACT_APP_LOGOFF_REDIRECT_URL=https://wallet.local:8081/logout
+REACT_APP_POST_LOGOUT_REDIRECT_URI=https://wallet.local:8081/logout/callback
+REACT_APP_REDIRECT_URI=https://wallet.local:8081/signin-oidc
+REACT_APP_REDIRECT_URL=https://wallet.local:8081/signin-oidc
+REACT_APP_SCOPE=openid profile api1.full_access
+REACT_APP_SILENT_REDIRECT_URL=https://wallet.local:8081/silentrenew
\ No newline at end of file
diff --git a/wallet-spa/src/store/oauth.js b/wallet-spa/src/store/oauth.js
index 61372895..849feb25 100644
--- a/wallet-spa/src/store/oauth.js
+++ b/wallet-spa/src/store/oauth.js
@@ -4,7 +4,7 @@ const api = axios.create({
     headers: {
       'Content-Type': 'application/json'
     },
-    baseURL: "https://localhost:5001/"
+    baseURL: `${process.env.REACT_APP_ACCOUNTS_API}`
   });
 
 api.interceptors.request.use(