diff --git a/.forgejo/workflows/before_almalinux_8.yaml b/.forgejo/workflows/before_almalinux_8.yaml
index 12f0c9e..918d1a6 100644
--- a/.forgejo/workflows/before_almalinux_8.yaml
+++ b/.forgejo/workflows/before_almalinux_8.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}almalinux:8
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/before_alpine_3.19.yaml b/.forgejo/workflows/before_alpine_3.19.yaml
index 2a4d47e..04ec3c5 100644
--- a/.forgejo/workflows/before_alpine_3.19.yaml
+++ b/.forgejo/workflows/before_alpine_3.19.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}alpine:3.19
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml
index 8d3228d..79805d3 100644
--- a/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml
+++ b/.forgejo/workflows/before_archlinux_base-20231112.0.191179.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}archlinux:base-20231112.0.191179
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/before_debian_bullseye.yaml b/.forgejo/workflows/before_debian_bullseye.yaml
index f1d76b6..ea3a83a 100644
--- a/.forgejo/workflows/before_debian_bullseye.yaml
+++ b/.forgejo/workflows/before_debian_bullseye.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}debian:bullseye
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/before_fedora_39.yaml b/.forgejo/workflows/before_fedora_39.yaml
index abb8cd5..bf2f84f 100644
--- a/.forgejo/workflows/before_fedora_39.yaml
+++ b/.forgejo/workflows/before_fedora_39.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}fedora:39
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/before_rockylinux_8.yaml b/.forgejo/workflows/before_rockylinux_8.yaml
index ba3fd0e..dc01418 100644
--- a/.forgejo/workflows/before_rockylinux_8.yaml
+++ b/.forgejo/workflows/before_rockylinux_8.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}rockylinux:8
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/before_ubuntu_jammy.yaml b/.forgejo/workflows/before_ubuntu_jammy.yaml
index 0c4dcac..29fe650 100644
--- a/.forgejo/workflows/before_ubuntu_jammy.yaml
+++ b/.forgejo/workflows/before_ubuntu_jammy.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}ubuntu:jammy
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/latest_almalinux_9.yaml b/.forgejo/workflows/latest_almalinux_9.yaml
index bc6a830..a4f4a9c 100644
--- a/.forgejo/workflows/latest_almalinux_9.yaml
+++ b/.forgejo/workflows/latest_almalinux_9.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}almalinux:9
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/latest_alpine_3.20.yaml b/.forgejo/workflows/latest_alpine_3.20.yaml
index 9895560..fc61963 100644
--- a/.forgejo/workflows/latest_alpine_3.20.yaml
+++ b/.forgejo/workflows/latest_alpine_3.20.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}alpine:3.20
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml
index d216c54..c1278b2 100644
--- a/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml
+++ b/.forgejo/workflows/latest_archlinux_base-20240101.0.204074.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}archlinux:base-20240101.0.204074
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/latest_debian_bookworm.yaml b/.forgejo/workflows/latest_debian_bookworm.yaml
index 2cdb6a2..1e27586 100644
--- a/.forgejo/workflows/latest_debian_bookworm.yaml
+++ b/.forgejo/workflows/latest_debian_bookworm.yaml
@@ -6,7 +6,6 @@ jobs:
     steps:
     - name: spcd
       env:
-        SPCD: ${{vars.SPCD}}
         SPCD_SSH_HOSTS: ${{vars.SPCD_SSH_HOSTS}}
         SPCD_SSH_KEY: ${{secrets.SPCD_SSH_KEY}}
       run: ${{vars.SPCD}}
diff --git a/.forgejo/workflows/latest_fedora_40.yaml b/.forgejo/workflows/latest_fedora_40.yaml
index 418b6a3..bceb0be 100644
--- a/.forgejo/workflows/latest_fedora_40.yaml
+++ b/.forgejo/workflows/latest_fedora_40.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}fedora:40
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/latest_rockylinux_9.yaml b/.forgejo/workflows/latest_rockylinux_9.yaml
index 73333d0..52593e3 100644
--- a/.forgejo/workflows/latest_rockylinux_9.yaml
+++ b/.forgejo/workflows/latest_rockylinux_9.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}rockylinux:9
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.forgejo/workflows/latest_ubuntu_noble.yaml b/.forgejo/workflows/latest_ubuntu_noble.yaml
index 275beb9..c83bd92 100644
--- a/.forgejo/workflows/latest_ubuntu_noble.yaml
+++ b/.forgejo/workflows/latest_ubuntu_noble.yaml
@@ -5,8 +5,6 @@ jobs:
       image: ${{vars.DOCKER}}ubuntu:noble
     steps:
     - name: spcd
-      env:
-        SPCD: ${{vars.SPCD}}
       run: ${{vars.SPCD}}
 
     - run: spcd-build-project
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 4733f41..43ea82b 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -6,7 +6,6 @@ jobs:
     steps:
     - name: spcd
       env:
-        SPCD: ${{vars.SPCD}}
         SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}}
         SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}}
       run: ${{vars.SPCD}}
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 2558b3b..f265520 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -7,10 +7,9 @@ jobs:
     steps:
     - name: spcd
       env:
-        SPCD: ${{vars.SPCD}}
         SPCD_GIT_MAIN: ${{vars.SPCD_GIT_MAIN}}
         SPCD_GIT_ROOT: ${{vars.SPCD_GIT_ROOT}}
-      run: echo '${{vars.SPCD}}' | tr -d "\r" | sh -s
+      run: echo '${{vars.SPCD}}' | tr -d '\r' | sh -s
 
     - run: spcd-build-project
     - run: spcd-browse-workspace
diff --git a/spcd/__init__.py b/spcd/__init__.py
index 48492b1..f47533b 100644
--- a/spcd/__init__.py
+++ b/spcd/__init__.py
@@ -53,7 +53,7 @@ def install_commands(path: str) -> None:
 def list_environment_variables() -> None:
     step("List environment variables")
     for variable, value in sorted(projects.environment.items()):
-        if variable not in ["SPCD", "SPCD_SSH_KEY"]:
+        if variable != "SPCD_SSH_KEY":
             log.info(f"{variable} = {value}")
         else:
             log.info(f"{variable}")