diff --git a/salt/server/spacewalk-search.sls b/salt/server/spacewalk-search.sls
index 299c522cf..e63843ca2 100644
--- a/salt/server/spacewalk-search.sls
+++ b/salt/server/spacewalk-search.sls
@@ -7,12 +7,7 @@ spacewalk_search_config:
   file.append:
     - name: /usr/share/rhn/config-defaults/rhn_search_daemon.conf
     - text: |
-        wrapper.java.additional.1=-Xdebug
-        wrapper.java.additional.2=-Xrunjdwp:transport=dt_socket,address=8002,server=y,suspend=n
-        wrapper.java.additional.3=-Dcom.sun.management.jmxremote.port=3335
-        wrapper.java.additional.4=-Dcom.sun.management.jmxremote.ssl=false
-        wrapper.java.additional.5=-Dcom.sun.management.jmxremote.authenticate=false
-        wrapper.java.additional.6=-Djava.rmi.server.hostname={{ salt['network.interfaces']()['eth0']['inet'][0]['address'] }}
+        JAVA_OPTS='-Xdebug -Xrunjdwp:transport=dt_socket,address=*:8002,server=y,suspend=n'
     - require:
       - sls: server
 
diff --git a/salt/server/tomcat.sls b/salt/server/tomcat.sls
index e73ed90b2..f16d9e5ae 100644
--- a/salt/server/tomcat.sls
+++ b/salt/server/tomcat.sls
@@ -13,7 +13,7 @@ tomcat_config:
   file.replace:
     - name: /etc/tomcat/conf.d/remote_debug.conf
     - pattern: 'JAVA_OPTS="(?!-Xdebug)(.*)"'
-    - repl: 'JAVA_OPTS=" $JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=*:8000,server=y,suspend=n "'
+    - repl: 'JAVA_OPTS=" $JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=*:8003,server=y,suspend=n "'
     - append_if_not_found: True
     - ignore_if_missing: True
     - require: