diff --git a/playbooks/roles/base/repos/tasks/Debian.yaml b/playbooks/roles/base/repos/tasks/Debian.yaml
index df6caad15c..db0b156276 100644
--- a/playbooks/roles/base/repos/tasks/Debian.yaml
+++ b/playbooks/roles/base/repos/tasks/Debian.yaml
@@ -1,3 +1,13 @@
+- name: Remove Rackspace APT repo
+  file:
+    path: /etc/apt/sources.list.d/ospc.list
+    state: absent
+  register: rax_apt_repo_removed
+
+- name: Remove Rackspace signing key
+  when: rax_apt_repo_removed.changed
+  command: apt-key del 4096R/CB1EF1DB
+
 - name: Configure apt retries
   copy:
     mode: 0444
diff --git a/playbooks/roles/base/server/tasks/Debian.yaml b/playbooks/roles/base/server/tasks/Debian.yaml
index f653ab5a92..9955b2d74b 100644
--- a/playbooks/roles/base/server/tasks/Debian.yaml
+++ b/playbooks/roles/base/server/tasks/Debian.yaml
@@ -1,7 +1,3 @@
-- name: Remove Rackspace signing key
-  when: rax_apt_repo_removed.changed
-  command: apt-key del 4096R/CB1EF1DB
-
 - name: Disable install of additional recommends and suggests packages
   copy:
      mode: 0444
diff --git a/playbooks/roles/base/server/tasks/main.yaml b/playbooks/roles/base/server/tasks/main.yaml
index 7bc825a6cf..de491342cc 100644
--- a/playbooks/roles/base/server/tasks/main.yaml
+++ b/playbooks/roles/base/server/tasks/main.yaml
@@ -1,9 +1,3 @@
-- name: Remove Rackspace APT repo
-  file:
-    path: /etc/apt/sources.list.d/ospc.list
-    state: absent
-  register: rax_apt_repo_removed
-
 - name: Install base packages
   package:
     state: present
@@ -35,7 +29,7 @@
     enabled: yes
     state: started
 
-- name: Set ssh key for managment
+- name: Set ssh key for management
   authorized_key:
     state: present
     user: root