diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs
index 9086f78f2d..233d7c6418 100644
--- a/util/Setup/EnvironmentFileBuilder.cs
+++ b/util/Setup/EnvironmentFileBuilder.cs
@@ -27,6 +27,7 @@ namespace Bit.Setup
                 ["globalSettings__baseServiceUri__identity"] = "http://localhost/identity",
                 ["globalSettings__baseServiceUri__admin"] = "http://localhost/admin",
                 ["globalSettings__baseServiceUri__sso"] = "http://localhost/sso",
+                ["globalSettings__baseServiceUri__portal"] = "http://localhost/portal",
                 ["globalSettings__baseServiceUri__notifications"] = "http://localhost/notifications",
                 ["globalSettings__baseServiceUri__internalNotifications"] = "http://notifications:5000",
                 ["globalSettings__baseServiceUri__internalAdmin"] = "http://admin:5000",
@@ -34,6 +35,7 @@ namespace Bit.Setup
                 ["globalSettings__baseServiceUri__internalApi"] = "http://api:5000",
                 ["globalSettings__baseServiceUri__internalVault"] = "http://web:5000",
                 ["globalSettings__baseServiceUri__internalSso"] = "http://sso:5000",
+                ["globalSettings__baseServiceUri__internalPortal"] = "http://portal:5000",
                 ["globalSettings__pushRelayBaseUri"] = "https://push.bitwarden.com",
                 ["globalSettings__installation__identityUri"] = "https://identity.bitwarden.com",
             };
@@ -92,6 +94,7 @@ namespace Bit.Setup
                 ["globalSettings__baseServiceUri__admin"] = $"{_context.Config.Url}/admin",
                 ["globalSettings__baseServiceUri__notifications"] = $"{_context.Config.Url}/notifications",
                 ["globalSettings__baseServiceUri__sso"] = $"{_context.Config.Url}/sso",
+                ["globalSettings__baseServiceUri__portal"] = $"{_context.Config.Url}/portal",
                 ["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString}\"",
                 ["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
                 ["globalSettings__attachment__baseDirectory"] = $"{_context.OutputDir}/core/attachments",
diff --git a/util/Setup/Templates/DockerCompose.hbs b/util/Setup/Templates/DockerCompose.hbs
index 3794a925a5..8e45e0c557 100644
--- a/util/Setup/Templates/DockerCompose.hbs
+++ b/util/Setup/Templates/DockerCompose.hbs
@@ -87,22 +87,22 @@ services:
       - default
       - public
 
-#  sso:
-#    image: bitwarden/sso:{{{CoreVersion}}}
-#    container_name: bitwarden-sso
-#    restart: always
-#    volumes:
-#      - ../identity:/etc/bitwarden/identity
-#      - ../core:/etc/bitwarden/core
-#      - ../ca-certificates:/etc/bitwarden/ca-certificates
-#      - ../logs/sso:/etc/bitwarden/logs
-#    env_file:
-#      - global.env
-#      - ../env/uid.env
-#      - ../env/global.override.env
-#    networks:
-#      - default
-#      - public
+  sso:
+    image: bitwarden/sso:{{{CoreVersion}}}
+    container_name: bitwarden-sso
+    restart: always
+    volumes:
+      - ../identity:/etc/bitwarden/identity
+      - ../core:/etc/bitwarden/core
+      - ../ca-certificates:/etc/bitwarden/ca-certificates
+      - ../logs/sso:/etc/bitwarden/logs
+    env_file:
+      - global.env
+      - ../env/uid.env
+      - ../env/global.override.env
+    networks:
+      - default
+      - public
 
   admin:
     image: bitwarden/admin:{{{CoreVersion}}}
@@ -122,6 +122,24 @@ services:
       - default
       - public
 
+  portal:
+    image: bitwarden/portal:{{{CoreVersion}}}
+    container_name: bitwarden-portal
+    restart: always
+    depends_on:
+      - mssql
+    volumes:
+      - ../core:/etc/bitwarden/core
+      - ../ca-certificates:/etc/bitwarden/ca-certificates
+      - ../logs/portal:/etc/bitwarden/logs
+    env_file:
+      - global.env
+      - ../env/uid.env
+      - ../env/global.override.env
+    networks:
+      - default
+      - public
+
   icons:
     image: bitwarden/icons:{{{CoreVersion}}}
     container_name: bitwarden-icons
diff --git a/util/Setup/Templates/NginxConfig.hbs b/util/Setup/Templates/NginxConfig.hbs
index 27f5ec3d0a..8c4b954784 100644
--- a/util/Setup/Templates/NginxConfig.hbs
+++ b/util/Setup/Templates/NginxConfig.hbs
@@ -104,9 +104,13 @@ server {
     proxy_pass http://identity:5000/;
   }
 
-#  location /sso/ {
-#    proxy_pass http://sso:5000/;
-#  }
+  location /sso/ {
+    proxy_pass http://sso:5000/;
+  }
+
+  location /portal/ {
+    proxy_pass http://portal:5000/;
+  }
 
   location /icons/ {
     proxy_pass http://icons:5000/;