stacklok · danbarr · Feb 17, 2025 · Feb 12, 2025 · Feb 12, 2025
diff --git a/docs/how-to/install.md b/docs/how-to/install.md
@@ -173,11 +173,11 @@ persistent volume.
 Now that CodeGate is running, proceed to
 [configure your AI assistant/agent](../integrations/index.mdx).
 
-## Remove CodeGate
+## Uninstall
 
-If you decide to stop using CodeGate, follow the removal steps for your
-[integration](../integrations/index.mdx), then stop and remove the CodeGate
-container and volume:
+If you decide to stop using CodeGate, undo the configuration changes you made to
+your [integration](../integrations/index.mdx) (usually by removing the API base
+URL setting or env var), then remove the CodeGate container and volume:
 
 ```bash
 docker rm -f codegate

diff --git a/docs/integrations/aider.mdx b/docs/integrations/aider.mdx
@@ -45,30 +45,3 @@ Learn more about CodeGate's features:
 
 - [Access the dashboard](../how-to/dashboard.md)
 - [CodeGate features](../features/index.mdx)
-
-## Remove CodeGate
-
-If you decide to stop using CodeGate, follow these steps to remove it and revert
-your environment.
-
-1. Quit aider and unset the environment variables you set during the
-   configuration process:
-
-   **OpenAI:** `unset OPENAI_API_BASE` (macOS/Linux) or
-   `setx OPENAI_API_BASE ""` (Windows)
-
-   **Ollama:** `unset OLLAMA_API_BASE` (macOS/Linux) or
-   `setx OLLAMA_API_BASE ""` (Windows)
-
-1. Stop and remove the CodeGate container:
-
-   ```bash
-   docker rm -f codegate
-   ```
-
-1. If you launched CodeGate with a persistent volume, delete it to remove the
-   CodeGate database and other files:
-
-   ```bash
-   docker volume rm codegate_volume
-   ```
diff --git a/docs/integrations/cline.mdx b/docs/integrations/cline.mdx
@@ -139,23 +139,3 @@ Learn more about CodeGate's features and how to use them:
 
 - [Access the dashboard](../how-to/dashboard.md)
 - [CodeGate features](../features/index.mdx)
-
-## Remove CodeGate
-
-If you decide to stop using CodeGate, follow these steps to remove it and revert
-your environment.
-
-1. Remove the custom base URL from your Cline provider settings.
-
-1. Stop and remove the CodeGate container:
-
-   ```bash
-   docker rm -f codegate
-   ```
-
-1. If you launched CodeGate with a persistent volume, delete it to remove the
-   CodeGate database and other files:
-
-   ```bash
-   docker volume rm codegate_volume
-   ```
diff --git a/docs/integrations/continue.mdx b/docs/integrations/continue.mdx
@@ -479,24 +479,3 @@ Learn more about CodeGate's features and how to use them:
 
 - [Access the dashboard](../how-to/dashboard.md)
 - [CodeGate features](../features/index.mdx)
-
-## Remove CodeGate
-
-If you decide to stop using CodeGate, follow these steps to remove it and revert
-your environment.
-
-1. Remove the `apiBase` configuration entries from your Continue configuration
-   file.
-
-1. Stop and remove the CodeGate container:
-
-   ```bash
-   docker rm -f codegate
-   ```
-
-1. If you launched CodeGate with a persistent volume, delete it to remove the
-   CodeGate database and other files:
-
-   ```bash
-   docker volume rm codegate_volume
-   ```
diff --git a/docs/integrations/copilot.mdx b/docs/integrations/copilot.mdx
@@ -273,27 +273,11 @@ Learn more about CodeGate's features and how to use them:
 - [Access the dashboard](../how-to/dashboard.md)
 - [CodeGate features](../features/index.mdx)
 
-## Remove CodeGate
-
-If you decide to stop using CodeGate, follow these steps to remove it and revert
-your environment.
+## Remove the CodeGate CA certificate
 
 import RemoveCert from '../partials/_remove-cert.mdx';
 
-1. Remove the proxy settings from your IDE configuration.
-
-1. Remove the CodeGate CA certificate from your trust store:
-
-   <RemoveCert />
-
-1. Stop and remove the CodeGate container:
-
-   ```bash
-   docker rm -f codegate
-   ```
-
-1. Delete the persistent volume:
+If you decide to stop using CodeGate, remove the proxy settings from your
+configuration and follow these steps to remove the CA certificate:
 
-   ```bash
-   docker volume rm codegate_volume
-   ```
+<RemoveCert />
diff --git a/docs/integrations/kodu.mdx b/docs/integrations/kodu.mdx
@@ -104,23 +104,3 @@ Learn more about CodeGate's features and how to use them:
 
 - [Access the dashboard](../how-to/dashboard.md)
 - [CodeGate features](../features/index.mdx)
-
-## Remove CodeGate
-
-If you decide to stop using CodeGate, follow these steps to remove it and revert
-your environment.
-
-1. Remove the custom base URL from your Claude Coder provider settings.
-
-1. Stop and remove the CodeGate container:
-
-   ```bash
-   docker stop codegate && docker rm codegate
-   ```
-
-1. If you launched CodeGate with a persistent volume, delete it to remove the
-   CodeGate database and other files:
-
-   ```bash
-   docker volume rm codegate_volume
-   ```
diff --git a/docs/integrations/open-interpreter.mdx b/docs/integrations/open-interpreter.mdx
@@ -107,24 +107,3 @@ like "CodeGate version 0.1.16".
 
 Learn more about [CodeGate's features](../features/index.mdx) and explore the
 [dashboard](../how-to/dashboard.md).
-
-## Remove CodeGate
-
-If you decide to stop using CodeGate, follow these steps to remove it and revert
-your environment.
-
-1. Quit Open Interpreter (<key>Ctrl</key>+<key>C</key>) and re-run it without
-   the API base parameter.
-
-1. Stop and remove the CodeGate container:
-
-   ```bash
-   docker rm -f codegate
-   ```
-
-1. If you launched CodeGate with a persistent volume, delete it to remove the
-   CodeGate database and other files:
-
-   ```bash
-   docker volume rm codegate_volume
-   ```
diff --git a/docs/partials/_remove-cert.mdx b/docs/partials/_remove-cert.mdx
@@ -26,20 +26,10 @@ GUI.
 </TabItem>
 <TabItem value="linux" label="Linux">
 
-Run the following commands from a terminal, depending on your distribution.
-
-Ubuntu/Debian based distributions:
-
-```bash
-sudo rm /usr/local/share/ca-certificates/codegate.crt
-sudo update-ca-certificates --fresh
-```
-
-RHEL/Fedora and other Enterprise Linux distributions:
+Run the following command from a terminal, then restart VS Code.
 
 ```bash
-sudo rm /etc/pki/ca-trust/source/anchors/codegate.pem
-sudo update-ca-trust
+certutil -d sql:$HOME/.pki/nssdb -D -n CodeGate-CA
 ```
 
 </TabItem>

diff --git a/docs/quickstart-continue.mdx b/docs/quickstart-continue.mdx
@@ -270,15 +270,16 @@ Finally, we want to hear about your experiences using CodeGate. Join the
 the project, and let us know about any bugs or feature requests in
 [GitHub Issues](https://github.com/stacklok/codegate/issues).
 
-## Clean up your environment
+## Removing CodeGate
 
 Of course we hope you'll want to continue using CodeGate, but if you want to
 stop using it, follow these steps to clean up your environment.
 
-1. Stop and remove the CodeGate container:
+1. Stop and remove the CodeGate container and persistent data volume:
 
    ```bash
    docker rm -f codegate
+   docker volume rm codegate_volume
    ```
 
 2. Remove the `apiBase` configuration entries from your Continue configuration

diff --git a/docs/quickstart-copilot.mdx b/docs/quickstart-copilot.mdx
@@ -246,7 +246,7 @@ channel on the [Stacklok Community Discord](https://discord.gg/stacklok) server
 to chat about the project, and let us know about any bugs or feature requests in
 [GitHub Issues](https://github.com/stacklok/codegate/issues).
 
-## Clean up your environment
+## Removing CodeGate
 
 Of course we hope you'll want to continue using CodeGate, but if you want to
 stop using it, follow these steps to clean up your environment.