diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml
index 6616d1e6fd..bb2301d7fc 100644
--- a/playbooks/groups/backup-server.yml
+++ b/playbooks/groups/backup-server.yml
@@ -4,7 +4,7 @@
 # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars
 
 - name: make backup server system
-  hosts: backup03.phx2.fedoraproject.org:backup01.phx2.fedoraproject.org
+  hosts: backup01.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
@@ -26,6 +26,7 @@
       mnt_dir: '/fedora_backups',
       nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid",
       nfs_src_dir: '/fedora_backups' }
+  - openvpn/client
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
@@ -50,7 +51,6 @@
 
   - name: Schedule the GNOME backup script
     cron: name="Backup" hour=5 minute=0 job="(cd /fedora_backups/gnome/; /usr/local/bin/lock-wrapper gnomebackup /usr/local/bin/gnome_backup)" user=gnomebackup
-    when: inventory_hostname.startswith('backup03')
 
   - name:  Add a Directory for each of the GNOME machines
     file: dest=/fedora_backups/gnome/{{ item }} owner=gnomebackup group=gnomebackup state=directory
diff --git a/roles/openvpn/server/files/ccd/backup01.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/backup01.phx2.fedoraproject.org
index 44319e181f..ae1e4878df 100644
--- a/roles/openvpn/server/files/ccd/backup01.phx2.fedoraproject.org
+++ b/roles/openvpn/server/files/ccd/backup01.phx2.fedoraproject.org
@@ -1,2 +1,2 @@
 # ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.142 192.168.0.142
+ifconfig-push 192.168.1.64 192.168.0.64
diff --git a/roles/openvpn/server/files/ccd/backup03.phx2.fedoraproject.org b/roles/openvpn/server/files/ccd/backup03.phx2.fedoraproject.org
deleted file mode 100644
index ae1e4878df..0000000000
--- a/roles/openvpn/server/files/ccd/backup03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
-# ifconfig-push actualIP PtPIP
-ifconfig-push 192.168.1.64 192.168.0.64
diff --git a/tasks/rdiff_backup_server.yml b/tasks/rdiff_backup_server.yml
index b3a3eb75a7..1e2d55366f 100644
--- a/tasks/rdiff_backup_server.yml
+++ b/tasks/rdiff_backup_server.yml
@@ -18,4 +18,3 @@
   copy: src="{{ files }}/rdiff-backup/run-rdiff-backups.cron" dest=/etc/cron.d/run-rdiff-backups
   tags:
   - config
-  when: inventory_hostname.startswith('backup03')