diff --git a/roles/spacewalk/tasks/main.yml b/roles/spacewalk/tasks/main.yml
index a805d5e..3ad40bf 100755
--- a/roles/spacewalk/tasks/main.yml
+++ b/roles/spacewalk/tasks/main.yml
@@ -2,11 +2,11 @@
   - name: Enable EPEL
     yum: name=epel-release
 
-  - name: Install jpackage repo
-    template: src=jpackage.j2 dest=/etc/yum.repos.d/jpackage-generic.repo
+  - name: Install newer java repo
+    command: cd /etc/yum.repos.d && curl -O https://copr.fedorainfracloud.org/coprs/g/spacewalkproject/java-packages/repo/epel-7/group_spacewalkproject-java-packages-epel-7.repo
 
   - name: Install Spacewalk repository
-    yum: name=http://yum.spacewalkproject.org/2.4/RHEL/{{ansible_distribution_major_version}}/x86_64/spacewalk-repo-2.4-3.el{{ansible_distribution_major_version}}.noarch.rpm
+    yum: name=http://yum.spacewalkproject.org/2.7/RHEL/{{ansible_distribution_major_version}}/x86_64/spacewalk-repo-2.7-2.el{{ansible_distribution_major_version}}.noarch.rpm
 
   - name: Install Spacewalk-setup-postgresql
     yum: name=spacewalk-setup-postgresql state=present
@@ -20,9 +20,13 @@
   - name: Copy answers file for spacewalk setip
     template: src=answers.j2 dest=/var/tmp/answers owner=root group=root mode=0600
 
-  - name: Install spacewalk
-    command: spacewalk-setup --disconnected --answer-file=/var/tmp/answers
-             creates=/var/satellite
-  #- template: src=iptables.j2 dest=/etc/sysconfig/iptables owner=root group=root mode=0600
-  #  notify: restart_iptables
+  - name: run initdb first as a workarpound, see https://bugzilla.redhat.com/show_bug.cgi?id=1524221
+    command: postgresql-setup initdb
+
+  - name: Install spacewalk
+    command: spacewalk-setup --answer-file=/var/tmp/answers
+             creates=/var/satellite
+
+  - template: src=iptables.j2 dest=/etc/sysconfig/iptables owner=root group=root mode=0600
+    notify: restart_iptables
 
diff --git a/spacewalk.yml b/spacewalk.yml
index 4aa1bcd..9bab6d8 100755
--- a/spacewalk.yml
+++ b/spacewalk.yml
@@ -30,4 +30,4 @@
   roles:
     - role: spacewalk-customisations
       spacewalk_admin_password: "{{admin_password}}"
-    - role: spacewalk-client
\ No newline at end of file
+    - role: spacewalk-client