diff --git a/actions-services.yml b/actions-services.yml
index 9c3cef6d..e3b6b5df 100644
--- a/actions-services.yml
+++ b/actions-services.yml
@@ -111,9 +111,9 @@ services:
       ID_BROKER_ASSERT_VALID_IP: "false"
       ID_BROKER_BASE_URI: "dummy"
       ID_BROKER_TRUSTED_IP_RANGES: "192.168.0.1/8"
-      MFA_SETUP_URL: "http://pwmanager.local:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
+      MFA_SETUP_URL: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub-custom-port"
       REMEMBER_ME_SECRET: "12345"
-      PROFILE_URL: "http://pwmanager:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
+      PROFILE_URL: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub-custom-port"
       PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
diff --git a/development/sp-local/config/authsources-pwmanager.php b/development/sp-local/config/authsources-pwmanager.php
index ea9c8ab0..80aee9c9 100644
--- a/development/sp-local/config/authsources-pwmanager.php
+++ b/development/sp-local/config/authsources-pwmanager.php
@@ -12,7 +12,7 @@
 
     'mfa-idp' => [
         'saml:SP',
-        'entityID' => 'http://pwmanager.local:8083',
+        'entityID' => 'http://pwmanager.local:8084',
         'idp' => 'http://ssp-idp1.local:8085',
         'discoURL' => null,
         'NameIDPolicy' => "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent",
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f47bfe9..eecb64eb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -172,9 +172,9 @@ services:
       ID_BROKER_ASSERT_VALID_IP: "false"
       ID_BROKER_BASE_URI: "dummy"
       ID_BROKER_TRUSTED_IP_RANGES: "192.168.0.1/8"
-      MFA_SETUP_URL: "http://pwmanager.local:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
+      MFA_SETUP_URL: "http://pwmanager.local:8084/module.php/core/authenticate.php?as=ssp-hub-custom-port"
       REMEMBER_ME_SECRET: "12345"
-      PROFILE_URL: "http://pwmanager:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
+      PROFILE_URL: "http://pwmanager.local:8084/module.php/core/authenticate.php?as=ssp-hub-custom-port"
       PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
@@ -324,7 +324,7 @@ services:
       # Utilize custom metadata
       - ./development/sp3-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
     ports:
-      - "8084:80"
+      - "8083:80"
     env_file:
       - local.env
     environment:
@@ -348,7 +348,7 @@ services:
       # Utilize custom metadata
       - ./development/sp-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
     ports:
-      - "8083:80"
+      - "8084:80"
     environment:
       - ADMIN_EMAIL=john_doe@there.com
       - ADMIN_PASS=sp1
diff --git a/docs/development.md b/docs/development.md
index bff583dc..e7f047c9 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -1,7 +1,8 @@
-Three SPs, a hub (a combined IdP and SP) and three IdPs get spun up by docker-compose.  In order for this to work, you will need to edit your hosts file to include entries for the following domains ...
+Four SPs, a hub (a combined IdP and SP) and three IdPs get spun up by docker-compose.  In order for this to work, you will need to edit your hosts file to include entries for the following domains ...
 * ssp-sp1.local   # to be used with port 8081
-* ssp-sp2.local  # to be used with port 8082
-* ssp-sp3.local  # to be used with port 8084
+* ssp-sp2.local   # to be used with port 8082
+* ssp-sp3.local   # to be used with port 8083
+* pwmanager.local # to be used with port 8084
 * ssp-hub.local
 * ssp-idp1.local  # to be used with port 8085
 * ssp-idp2.local  # to be used with port 8086