diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a15b335..a0baefa 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -28,7 +28,7 @@
                                 "features",
                                 "publish",
                                 "--namespace",
-                                "deep-space-cartel/devcontainers-features",
+                                "deepspacecartel/devcontainers-features",
                                 "src/"
                             ],
                             "group": {
@@ -44,7 +44,7 @@
                                 "features",
                                 "generate-docs",
                                 "--namespace",
-                                "deep-space-cartel/devcontainers-features",
+                                "deepspacecartel/devcontainers-features",
                                 "--project-folder",
                                 "src/"
                             ],
@@ -157,7 +157,7 @@
                         }
                     ]
                 },
-                "dotfiles.repository": "deep-space-cartel/dotfiles",
+                "dotfiles.repository": "deepspacecartel/dotfiles",
                 "editor.fontFamily": "'Hack Nerd Font Mono'",
                 "files.insertFinalNewline": true,
                 "json.schemas": [
@@ -173,15 +173,15 @@
         }
     },
     "features": {
-        "ghcr.io/deep-space-cartel/devcontainers-features/starship:1": {},
-        "ghcr.io/deep-space-cartel/devcontainers-features/pip:1": {
-            "packages": "pre-commit",
-            "location": "/opt/pip"
-        },
-        "ghcr.io/deep-space-cartel/devcontainers-features/apt:1": {
-            "packages": "shellcheck shfmt mc python3-pip python3-venv"
-        },
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+        // "ghcr.io/deepspacecartel/devcontainers-features/starship:1": {},
+        // "ghcr.io/deepspacecartel/devcontainers-features/pip:1": {
+        //     "packages": "pre-commit",
+        //     "location": "/opt/pip"
+        // },
+        // "ghcr.io/deepspacecartel/devcontainers-features/apt:1": {
+        //     "packages": "shellcheck shfmt mc python3-pip python3-venv"
+        // },
+        // "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },
     "image": "mcr.microsoft.com/devcontainers/javascript-node:1-20-bookworm",
     "remoteEnv": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 33e7580..b38d07e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
     hooks:
     -   id: devcontainer-docs
         name: "Dev Container Features: Generate Docs"
-        entry: devcontainer features generate-docs --namespace deep-space-cartel/devcontainers-features --project-folder src/
+        entry: devcontainer features generate-docs --namespace deepspacecartel/devcontainers-features --project-folder src/
         language: system
         always_run: true
         pass_filenames: false
diff --git a/README.md b/README.md
index b27b3fa..84615be 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Dev Container Features
 
-[![CI - Test Features](https://github.com/deep-space-cartel/devcontainers-features/actions/workflows/test.yaml/badge.svg)](https://github.com/deep-space-cartel/devcontainers-features/actions/workflows/test.yaml)
+[![CI - Test Features](https://github.com/deepspacecartel/devcontainers-features/actions/workflows/test.yaml/badge.svg)](https://github.com/deepspacecartel/devcontainers-features/actions/workflows/test.yaml)
 
 ## Features
 
@@ -10,7 +10,7 @@
 {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
-        "ghcr.io/deep-space-cartel/devcontainers-features/apt:latest": {
+        "ghcr.io/deepspacecartel/devcontainers-features/apt:2": {
             "packages": "shellcheck shfmt"
         }
     }
@@ -28,9 +28,9 @@ Install `pre-commit` via PIP Installs Packages:
         "PATH": "${containerEnv:PATH}:/opt/pip/bin"
     },
     "features": {
-        "ghcr.io/deep-space-cartel/devcontainers-features/pip:1": {
+        "ghcr.io/deepspacecartel/devcontainers-features/pip:2": {
             "packages": "pre-commit",
-            "location": "/opt/pip/bin",
+            "location": "/opt/pip",
         }
     }
 }
@@ -57,7 +57,7 @@ The minimal, blazing-fast, and infinitely customizable prompt for any shell!
 {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
-        "ghcr.io/deep-space-cartel/devcontainers-features/starship:latest": {
+        "ghcr.io/deepspacecartel/devcontainers-features/starship:2": {
             "version": "latest"
         }
     }
@@ -71,7 +71,7 @@ Since `starship` is managed by configuration files in `$HOME` consider using the
     "customizations": {
         "vscode": {
             "settings": {
-                "dotfiles.repository": "deep-space-cartel/dotfiles"
+                "dotfiles.repository": "deepspacecartel/dotfiles"
             }
         }
     }
@@ -84,7 +84,7 @@ If you are using `devcontainers-features/apt` as well then you might have to add
 {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
-        "ghcr.io/deep-space-cartel/devcontainers-features/starship:latest": {
+        "ghcr.io/deepspacecartel/devcontainers-features/starship:2": {
             "version": "latest"
         }
     }
@@ -148,7 +148,7 @@ devcontainers-features on  main +/- [😵]
 
 Consider using along with:
 
-* <https://github.com/deep-space-cartel/dotfiles>
+* <https://github.com/deepspacecartel/dotfiles>
 
 ## Development
 
@@ -161,13 +161,13 @@ pre-commit run --hook-stage manual
 Upload packages
 
 ```bash
-devcontainer features publish --namespace deep-space-cartel/devcontainers-features src/
+devcontainer features publish --namespace deepspacecartel/devcontainers-features src/
 ```
 
 Generate docs:
 
 ```bash
-devcontainer features generate-docs --namespace deep-space-cartel/devcontainers-features --project-folder src/
+devcontainer features generate-docs --namespace deepspacecartel/devcontainers-features --project-folder src/
 ```
 
 ## TODO
diff --git a/src/apt/README.md b/src/apt/README.md
index 0694ce2..70fc672 100644
--- a/src/apt/README.md
+++ b/src/apt/README.md
@@ -7,7 +7,7 @@ Install apt packages via JSON or apt.txt
 
 ```json
 "features": {
-    "ghcr.io/deep-space-cartel/devcontainers-features/apt:1": {}
+    "ghcr.io/deepspacecartel/devcontainers-features/apt:1": {}
 }
 ```
 
diff --git a/src/apt/devcontainer-feature.json b/src/apt/devcontainer-feature.json
index 89b77a9..de1a8f4 100644
--- a/src/apt/devcontainer-feature.json
+++ b/src/apt/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "Install package(s) via Advanced Package Tool",
     "id": "apt",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "description": "Install apt packages via JSON or apt.txt",
     "options": {
         "packages": {
diff --git a/src/pip/README.md b/src/pip/README.md
index 8e2ec92..c08a99e 100644
--- a/src/pip/README.md
+++ b/src/pip/README.md
@@ -7,7 +7,7 @@ Install Python packages via JSON or requirements.txt
 
 ```json
 "features": {
-    "ghcr.io/deep-space-cartel/devcontainers-features/pip:1": {}
+    "ghcr.io/deepspacecartel/devcontainers-features/pip:1": {}
 }
 ```
 
diff --git a/src/pip/devcontainer-feature.json b/src/pip/devcontainer-feature.json
index b35c90f..3fcf6b8 100644
--- a/src/pip/devcontainer-feature.json
+++ b/src/pip/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "Install package(s) via Pip Installs Packages",
     "id": "pip",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "description": "Install Python packages via JSON or requirements.txt",
     "options": {
         "location": {
@@ -23,12 +23,12 @@
         }
     },
     "dependsOn": {
-        "ghcr.io/deep-space-cartel/devcontainers-features/apt:1": {
+        "ghcr.io/deepspacecartel/devcontainers-features/apt:1": {
             "packages": "python3-pip python3-venv"
         }
     },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils",
-        "ghcr.io/deep-space-cartel/devcontainers-features/apt"
+        "ghcr.io/deepspacecartel/devcontainers-features/apt"
     ]
 }
diff --git a/src/starship/README.md b/src/starship/README.md
index 2f0f419..c28bc93 100644
--- a/src/starship/README.md
+++ b/src/starship/README.md
@@ -7,7 +7,7 @@ The minimal, blazing-fast, and infinitely customizable prompt for any shell!
 
 ```json
 "features": {
-    "ghcr.io/deep-space-cartel/devcontainers-features/starship:1": {}
+    "ghcr.io/deepspacecartel/devcontainers-features/starship:1": {}
 }
 ```
 
diff --git a/src/starship/devcontainer-feature.json b/src/starship/devcontainer-feature.json
index a3b7e5d..a64cbbd 100644
--- a/src/starship/devcontainer-feature.json
+++ b/src/starship/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "Starship",
     "id": "starship",
-    "version": "1.2.0",
+    "version": "2.0.0",
     "description": "The minimal, blazing-fast, and infinitely customizable prompt for any shell!",
     "options": {
         "platform": {
@@ -32,7 +32,7 @@
     },
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils": {},
-        "ghcr.io/deep-space-cartel/devcontainers-features/apt:1": {
+        "ghcr.io/deepspacecartel/devcontainers-features/apt:1": {
             "packages": "bash-completion"
         }
     }