diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 4ea30bb..2bf7f88 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,5 +1,5 @@
 - name: Install and configure Docker
-  tags: [docker, server]
+  tags: [docker]
   become: true
   block:
     - name: Install Docker
diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml
index 2e683e7..9d3985a 100644
--- a/roles/python/tasks/main.yml
+++ b/roles/python/tasks/main.yml
@@ -14,6 +14,7 @@
       shell: "{{ default_user_home }}/.pyenv/bin/pyenv install {{ pyenv_python_version }}"
       args:
         creates: "{{ default_user_home }}/.pyenv/versions/{{ pyenv_python_version }}/bin/python"
+      when: install_pyenv_python
 
     - name: Install pipx
       command: python3 -m pip install pipx --user
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index b957770..3e2bf40 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Configure SSH access
-  tags: [ssh, server]
+  tags: [ssh]
   become: true
   block:
     - name: Remove any PermitRootLogin instruction