diff --git a/.devcontainer/bitwarden_common/docker-compose.yml b/.devcontainer/bitwarden_common/docker-compose.yml
index 2f3a62877e..1e6e6b84cc 100644
--- a/.devcontainer/bitwarden_common/docker-compose.yml
+++ b/.devcontainer/bitwarden_common/docker-compose.yml
@@ -6,23 +6,6 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-  bitwarden_mssql:
-    image: mcr.microsoft.com/mssql/server:2022-latest
-    platform: linux/amd64
-    restart: unless-stopped
-    env_file:
-      - path: ../../dev/.env
-        required: false
-    environment:
-      ACCEPT_EULA: "Y"
-      MSSQL_PID: Developer
-    volumes:
-      - mssql_dev_data:/var/opt/mssql
-      - ../../util/Migrator:/mnt/migrator/
-      - ../../dev/helpers/mssql:/mnt/helpers
-      - ../../dev/.data/mssql:/mnt/data
-    network_mode: service:bitwarden_server
-
   bitwarden_mail:
     image: sj26/mailcatcher:latest
     restart: unless-stopped
diff --git a/.devcontainer/community_dev/devcontainer.json b/.devcontainer/community_dev/devcontainer.json
index ce3b8a21c6..3107627175 100644
--- a/.devcontainer/community_dev/devcontainer.json
+++ b/.devcontainer/community_dev/devcontainer.json
@@ -6,7 +6,8 @@
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
       "version": "16"
-    }
+    },
+    "ghcr.io/devcontainers/features/docker-outside-of-docker": {}
   },
   "mounts": [
     {
diff --git a/.devcontainer/internal_dev/devcontainer.json b/.devcontainer/internal_dev/devcontainer.json
index 862b9297c4..d4b0ab3e31 100644
--- a/.devcontainer/internal_dev/devcontainer.json
+++ b/.devcontainer/internal_dev/devcontainer.json
@@ -9,7 +9,8 @@
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
       "version": "16"
-    }
+    },
+    "ghcr.io/devcontainers/features/docker-outside-of-docker": {}
   },
   "mounts": [
     {
diff --git a/.devcontainer/internal_dev/docker-compose.override.yml b/.devcontainer/internal_dev/docker-compose.override.yml
index acf7b0b66e..35138ff332 100644
--- a/.devcontainer/internal_dev/docker-compose.override.yml
+++ b/.devcontainer/internal_dev/docker-compose.override.yml
@@ -1,4 +1,21 @@
 services:
+  bitwarden_mssql:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    platform: linux/amd64
+    restart: unless-stopped
+    env_file:
+      - path: ../../dev/.env
+        required: false
+    environment:
+      ACCEPT_EULA: "Y"
+      MSSQL_PID: Developer
+    volumes:
+      - mssql_dev_data:/var/opt/mssql
+      - ../../util/Migrator:/mnt/migrator/
+      - ../../dev/helpers/mssql:/mnt/helpers
+      - ../../dev/.data/mssql:/mnt/data
+    network_mode: service:bitwarden_server
+
   bitwarden_storage:
     image: mcr.microsoft.com/azure-storage/azurite:latest
     restart: unless-stopped
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 567f9b6e58..60840a82ac 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -251,6 +251,24 @@
             "type": "shell",
             "command": "dotnet tool install -g dotnet-certificate-tool -g && certificate-tool add --file ${workspaceFolder}/dev/dev.pfx --password '${input:certPassword}'",
             "problemMatcher": []
+        },
+        {
+            "label": "Add Docker Compose Profile",
+            "detail": "Adds a docker compose profile to give your local development setup more abilities.",
+            "type": "shell",
+            "command": "bash",
+            "args": [
+                "${workspaceFolder}/dev/add-dc-profile.sh",
+                "${input:dockerComposeProfile}"
+            ],
+            // If they are on windows, they can't be in a codespace or dev container so we can just run the command directly.
+            "windows": {
+                "command": "Write-Output",
+                "args": [
+                    "Work in progress ${input:dockerComposeProfile}"
+                ]
+            },
+            "problemMatcher": []
         }
     ],
     "inputs": [
@@ -275,6 +293,29 @@
             "type": "promptString",
             "description": "Password for your dev certificate.",
             "password": true
+        },
+        {
+            "id": "dockerComposeProfile",
+            "type": "pickString",
+            "description": "The name of the profile to add.",
+            "options": [
+                {
+                    "label": "Containers focused towards testing SSO.",
+                    "value": "idp",
+                },
+                {
+                    "label": "MySQL",
+                    "value": "mysql"
+                },
+                {
+                    "label": "PostgreSQL",
+                    "value": "postgres"
+                },
+                {
+                    "label": "Containers focused towards testing Azure",
+                    "value": "storage"
+                }
+            ]
         }
     ]
 }
diff --git a/dev/add-dc-profile.sh b/dev/add-dc-profile.sh
new file mode 100644
index 0000000000..b754f7db8f
--- /dev/null
+++ b/dev/add-dc-profile.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+if [[ -z "${CODESPACES}" ]]; then
+  if [[ -z "${HOSTNAME}" ]]; then
+    # Add docker compose profile using local strategy
+    echo "Locally"
+  else
+    # Add docker compose profile to dev container
+    echo "In DevContainer"
+  fi
+else
+  # Add docker compose profile to codespace
+  echo "In Codespaces"
+fi