diff --git a/roles/badges/backend/templates/badges-awarder.py b/roles/badges/backend/templates/badges-awarder.py
index cff12a91cc..4984d5c24e 100644
--- a/roles/badges/backend/templates/badges-awarder.py
+++ b/roles/badges/backend/templates/badges-awarder.py
@@ -33,7 +33,7 @@ config = {
     # to fas usernames so it can act appropriately on certain message types.
     "fas_credentials": {
     {% if env == 'staging' %}
-        "base_url": "https://admin.stg.fedoraproject.org/accounts/",
+        "base_url": "https://accounts.stg.fedoraproject.org/",
     {% endif %}
         "username": "{{fedoraDummyUser}}",
         "password": "{{fedoraDummyUserPassword}}",
diff --git a/roles/distgit/pagure/files/fas2.py b/roles/distgit/pagure/files/fas2.py
index 53e145a779..45cd9d5133 100644
--- a/roles/distgit/pagure/files/fas2.py
+++ b/roles/distgit/pagure/files/fas2.py
@@ -112,7 +112,7 @@ class AccountSystem(BaseClient):
     # URLs for remote avatar providers.
     _valid_avatar_services = ['libravatar', 'gravatar']
 
-    def __init__(self, base_url='https://admin.fedoraproject.org/accounts/',
+    def __init__(self, base_url='https://accounts.fedoraproject.org/',
                  *args, **kwargs):
         '''Create the AccountSystem client object.
 
diff --git a/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2 b/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2
index e56b613de5..5c228a7d1f 100644
--- a/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2
+++ b/roles/distgit/pagure/templates/pagure-sync-bugzilla.py.j2
@@ -101,14 +101,14 @@ VERBOSE = False
 DRYRUN = False
 
 {% if env == 'staging' %}
-FASURL = 'https://admin.stg.fedoraproject.org/accounts'
+FASURL = 'https://accounts.stg.fedoraproject.org'
 FASINSECURE = True
 PAGUREURL = 'https://stg.pagure.io'
 PAGURE_DIST_GIT_URL = 'https://src.stg.fedoraproject.org'
 PDCURL = 'https://pdc.stg.fedoraproject.org/rest_api/v1/'
 MDAPIURL = 'https://apps.stg.fedoraproject.org/mdapi/'
 {% else %}
-FASURL = 'https://admin.fedoraproject.org/accounts'
+FASURL = 'https://accounts.fedoraproject.org'
 FASINSECURE = False
 PAGUREURL = 'https://pagure.io'
 PAGURE_DIST_GIT_URL = 'https://src.fedoraproject.org'
@@ -190,8 +190,8 @@ address.
 
 c) Change your Fedora Account System email to match your existing
 bugzilla.redhat.com account.
-https://admin.fedoraproject.org/accounts login, click on 'my account',
-then 'edit' and change your email address.
+https://accounts.fedoraproject.org login, click on 'Edit profile',
+then 'Emails' and change your email address.
 
 If you have questions or concerns, please let us know.
 
diff --git a/roles/distgit/pagure/templates/pagure.cfg b/roles/distgit/pagure/templates/pagure.cfg
index 6fcc8e7910..7847c9de7f 100644
--- a/roles/distgit/pagure/templates/pagure.cfg
+++ b/roles/distgit/pagure/templates/pagure.cfg
@@ -244,11 +244,11 @@ REQUIRED_GROUPS = {
 
 {% if env == 'staging' %}
 RESULTSDB_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/'
-FAS_URL = 'https://admin.stg.fedoraproject.org/accounts'
+FAS_URL = 'https://accounts.stg.fedoraproject.org'
 FAS_OPENID_ENDPOINT = 'https://id.stg.fedoraproject.org/openid/'
 {% else %}
 RESULTSDB_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/'
-FAS_URL = 'https://admin.fedoraproject.org/accounts'
+FAS_URL = 'https://accounts.fedoraproject.org'
 {% endif %}
 
 THEME_TEMPLATE_FOLDER = '/usr/share/pagure_dist_git/template/'
diff --git a/roles/fedmsg/datanommer/templates/fas-credentials.py b/roles/fedmsg/datanommer/templates/fas-credentials.py
index 176c77935b..76416d2178 100644
--- a/roles/fedmsg/datanommer/templates/fas-credentials.py
+++ b/roles/fedmsg/datanommer/templates/fas-credentials.py
@@ -3,7 +3,7 @@ config = dict(
         username="fedoradummy",
         password="{{ fedoraDummyUserPassword }}",
     {% if env == 'staging' %}
-        base_url="https://admin.stg.fedoraproject.org/accounts/",
+        base_url="https://accounts.stg.fedoraproject.org/",
     {% endif %}
     ),
 )
diff --git a/roles/fedmsg/irc/templates/fas-credentials.py b/roles/fedmsg/irc/templates/fas-credentials.py
index 176c77935b..76416d2178 100644
--- a/roles/fedmsg/irc/templates/fas-credentials.py
+++ b/roles/fedmsg/irc/templates/fas-credentials.py
@@ -3,7 +3,7 @@ config = dict(
         username="fedoradummy",
         password="{{ fedoraDummyUserPassword }}",
     {% if env == 'staging' %}
-        base_url="https://admin.stg.fedoraproject.org/accounts/",
+        base_url="https://accounts.stg.fedoraproject.org/",
     {% endif %}
     ),
 )
diff --git a/roles/mailman/files/signup_closed.html b/roles/mailman/files/signup_closed.html
index d38566be50..ac1e89a9cf 100644
--- a/roles/mailman/files/signup_closed.html
+++ b/roles/mailman/files/signup_closed.html
@@ -10,7 +10,7 @@
 <p>
 {% blocktrans %}
 Account creation for the Fedora mailing-lists is done by
-<a href="https://admin.fedoraproject.org/accounts/user/new">creating an account in FAS</a>.
+<a href="https://accounts.fedoraproject.org/">creating an account in FAS</a>.
 {% endblocktrans %}
 </p>
 
diff --git a/roles/membership-map/build/templates/membership-map.py b/roles/membership-map/build/templates/membership-map.py
index 9ec1bfe4db..97bc48cfab 100755
--- a/roles/membership-map/build/templates/membership-map.py
+++ b/roles/membership-map/build/templates/membership-map.py
@@ -41,9 +41,9 @@ def calc_list():
     password = '{{ fedoraDummyUserPassword }}'
 
 {% if env == "staging" %}
-    base_url = 'https://admin.stg.fedoraproject.org/accounts/'
+    base_url = 'https://accounts.stg.fedoraproject.org/'
 {% else %}
-    base_url = 'https://admin.fedoraproject.org/accounts/'
+    base_url = 'https://accounts.fedoraproject.org/'
 {% endif %}
 
     fas = AccountSystem(base_url=base_url, username=username, password=password)
diff --git a/roles/membership-map/build/templates/membership-mwclient.py b/roles/membership-map/build/templates/membership-mwclient.py
index a78dbd50dc..54ed545964 100644
--- a/roles/membership-map/build/templates/membership-mwclient.py
+++ b/roles/membership-map/build/templates/membership-mwclient.py
@@ -96,9 +96,9 @@ def calc_list():
 #    username = raw_input('Username: ').strip()
 #    password = getpass.getpass('Password: ')    
 {% if env == "staging" %}
-    base_url = 'https://admin.stg.fedoraproject.org/accounts/'
+    base_url = 'https://accounts.stg.fedoraproject.org/'
 {% else %}
-    base_url = 'https://admin.fedoraproject.org/accounts/'
+    base_url = 'https://accounts.fedoraproject.org/'
 {% endif %}
 
     fas = AccountSystem(base_url=base_url, username=username, password=password, timeout=600)
diff --git a/roles/notifs/backend/files/fasjson-port/consumer.py b/roles/notifs/backend/files/fasjson-port/consumer.py
index ee9fedc43a..b607b1434a 100644
--- a/roles/notifs/backend/files/fasjson-port/consumer.py
+++ b/roles/notifs/backend/files/fasjson-port/consumer.py
@@ -8,7 +8,7 @@ what user notification preferences are, both of which require expensive API
 queries to `FAS`_, `pkgdb`_, or the database.
 
 .. _fedmsg consumer: http://www.fedmsg.com/en/latest/consuming/#the-hub-consumer-approach
-.. _FAS: https://admin.fedoraproject.org/accounts/
+.. _FAS: https://accounts.fedoraproject.org/
 .. _pkgdb: https://admin.fedoraproject.org/pkgdb/
 """
 
diff --git a/roles/notifs/backend/files/fasjson-port/fmn_fasshim.py b/roles/notifs/backend/files/fasjson-port/fmn_fasshim.py
index ed3dd87d43..dc586c1bc8 100644
--- a/roles/notifs/backend/files/fasjson-port/fmn_fasshim.py
+++ b/roles/notifs/backend/files/fasjson-port/fmn_fasshim.py
@@ -22,7 +22,7 @@ _cache = make_region(
 
 log = logging.getLogger("moksha.hub")
 
-default_url = 'https://admin.fedoraproject.org/accounts/'
+default_url = 'https://accounts.fedoraproject.org/'
 creds = config.app_conf['fas_credentials']
 
 fasjson = config.app_conf['fasjson']
diff --git a/roles/notifs/backend/templates/fmn.consumer.py b/roles/notifs/backend/templates/fmn.consumer.py
index fbac3c849a..a5fe5da260 100644
--- a/roles/notifs/backend/templates/fmn.consumer.py
+++ b/roles/notifs/backend/templates/fmn.consumer.py
@@ -94,7 +94,7 @@ config = {
     "fas_credentials": {
         "username": "{{fedoraDummyUser}}",
         "password": "{{fedoraDummyUserPassword}}",
-        "base_url": "https://admin.stg.fedoraproject.org/accounts",
+        "base_url": "https://accounts.stg.fedoraproject.org",
     },
     {% else -%}
     "fasjson": {
diff --git a/roles/notifs/frontend/templates/fmn.web.py b/roles/notifs/frontend/templates/fmn.web.py
index d74c159fd8..10615df9d9 100644
--- a/roles/notifs/frontend/templates/fmn.web.py
+++ b/roles/notifs/frontend/templates/fmn.web.py
@@ -16,7 +16,7 @@ config = {
     "fas_credentials": {
         "username": "{{fedoraDummyUser}}",
         "password": "{{fedoraDummyUserPassword}}",
-        "base_url": "https://admin.stg.fedoraproject.org/accounts",
+        "base_url": "https://accounts.stg.fedoraproject.org",
     },
     {% else %}
     "fas_credentials": {
diff --git a/roles/planet/files/sub-planets/people/templates/index.html.tmpl b/roles/planet/files/sub-planets/people/templates/index.html.tmpl
index 3ced20232c..f6b74639f9 100644
--- a/roles/planet/files/sub-planets/people/templates/index.html.tmpl
+++ b/roles/planet/files/sub-planets/people/templates/index.html.tmpl
@@ -44,7 +44,7 @@
                             </a>
                           </h2>
                             <small>Posted by <a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
-                            <span class="fas-account">(<img src="https://fedoraproject.org/w/uploads/a/ac/Infra-icon_fas.png" alt="Fedora Account System Username" name="Fedora Account System Username"><a href="https://admin.fedoraproject.org/accounts/user/view/<TMPL_VAR channel_fasname ESCAPE="HTML">"><TMPL_VAR channel_fasname ESCAPE="HTML"></a>)</span>
+                            <span class="fas-account">(<img src="https://fedoraproject.org/w/uploads/a/ac/Infra-icon_fas.png" alt="Fedora Account System Username" name="Fedora Account System Username"><a href="https://accounts.fedoraproject.org/user/<TMPL_VAR channel_fasname ESCAPE="HTML">"><TMPL_VAR channel_fasname ESCAPE="HTML"></a>)</span>
                             on <a href="<TMPL_VAR link>"><TMPL_VAR date></a>
                             </small>
                         </div>