diff --git a/configurationserver/ConfigurationServerLauncher.sh b/configurationserver/ConfigurationServerLauncher.sh
deleted file mode 100644
index 3da7a6ecb..000000000
--- a/configurationserver/ConfigurationServerLauncher.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -server -Xms512m -Xmx512m -XX:+CMSParallelRemarkEnabled -XX:+CMSScavengeBeforeRemark -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=50 -XX:CMSWaitDuration=300000 -XX:GCTimeRatio=40 -XX:MaxPermSize=256m -classpath '.:lib/*' -DEDDI_ENV=production io.sls.configuration.ConfigurationServer
diff --git a/configurationserver/ConfigurationServerStartup.bat b/configurationserver/ConfigurationServerStartup.bat
index 5682e8e4d..7efb42d38 100644
--- a/configurationserver/ConfigurationServerStartup.bat
+++ b/configurationserver/ConfigurationServerStartup.bat
@@ -1 +1,32 @@
-java -classpath ".;lib\*" -DEDDI_ENV=production io.sls.configuration.ConfigurationServer
\ No newline at end of file
+@echo off
+if [%1] == [] (
+    echo "Usage: <environment> [rmi-server-hostname]"
+    goto end
+)
+
+if  %1==production (
+SET JAVA_OPTS= ^
+        -server -Xms512m -Xmx512m ^
+        -XX:+UseConcMarkSweepGC ^
+        -XX:+CMSParallelRemarkEnabled ^
+        -XX:+UseCMSInitiatingOccupancyOnly ^
+        -XX:CMSInitiatingOccupancyFraction=50 ^
+        -XX:CMSWaitDuration=300000 ^
+        -XX:+CMSScavengeBeforeRemark ^
+        -XX:+ScavengeBeforeFullGC ^
+        -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:gc.log ^
+        -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M ^
+        -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=`date`.hprof ^
+        -Djava.rmi.server.hostname=%2 ^
+        -Dcom.sun.management.jmxremote.port=9010 ^
+        -Dcom.sun.management.jmxremote.authenticate=false ^
+        -Dcom.sun.management.jmxremote.ssl=false
+) else if %1==development (
+	SET JAVA_OPTS=
+) else (
+	echo "Invalid environment %1"
+	goto end
+)
+
+java %JAVA_OPTS% -classpath .;lib/* -DEDDI_ENV=%1 io.sls.configuration.ConfigurationServer
+:end
\ No newline at end of file
diff --git a/configurationserver/ConfigurationServerStartup.sh b/configurationserver/ConfigurationServerStartup.sh
index 26308e2e1..62a59ca8f 100644
--- a/configurationserver/ConfigurationServerStartup.sh
+++ b/configurationserver/ConfigurationServerStartup.sh
@@ -1,2 +1,34 @@
-#!/bin/sh
-java -classpath '.:lib/*' -DEDDI_ENV=production io.sls.configuration.ConfigurationServer
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    echo "Usage: <environment> [rmi-server-hostname]"
+    exit
+fi
+
+if [ "$1" = "production" ]; then
+
+read -d '' JAVA_OPTS <<EOF
+        -server -Xms512m -Xmx512m
+        -XX:+UseConcMarkSweepGC
+        -XX:+CMSParallelRemarkEnabled
+        -XX:+UseCMSInitiatingOccupancyOnly
+        -XX:CMSInitiatingOccupancyFraction=50
+        -XX:CMSWaitDuration=300000
+        -XX:+CMSScavengeBeforeRemark
+        -XX:+ScavengeBeforeFullGC
+        -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:/var/log/gc.log
+        -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M
+        -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/eddi/`date`.hprof
+        -Djava.rmi.server.hostname=$2
+        -Dcom.sun.management.jmxremote.port=9010
+        -Dcom.sun.management.jmxremote.authenticate=false
+        -Dcom.sun.management.jmxremote.ssl=false
+EOF
+
+elif [ "$1" = "development" ]; then
+    JAVA_OPTS=""
+else
+    echo "Invalid environment $1"
+    exit
+fi
+java $JAVA_OPTS -classpath '.:lib/*' -DEDDI_ENV=$1 io.sls.configuration.ConfigurationServer
\ No newline at end of file
diff --git a/configurationserver/pom.xml b/configurationserver/pom.xml
index eb8fc9fcf..645607e54 100644
--- a/configurationserver/pom.xml
+++ b/configurationserver/pom.xml
@@ -142,7 +142,7 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>install</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
diff --git a/configurationserver/src/assembly/assembly.xml b/configurationserver/src/assembly/assembly.xml
index 793bd7ca7..c392211b8 100644
--- a/configurationserver/src/assembly/assembly.xml
+++ b/configurationserver/src/assembly/assembly.xml
@@ -9,26 +9,21 @@
     <!-- Insert here extra files as configs or, batch files, resources, docs etc-->
     <fileSets>
         <fileSet>
-                <outputDirectory>/</outputDirectory>
-                <includes>
-                        <include>config/*.*</include>
-                        <include>resources/**/*.*</include>
-                        <include>keystore/*.*</include>
-                        <include>*.sh</include>
-                        <include>*.bat</include>
-                </includes>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>config/**/*.*</include>
+                <include>resources/**/*.*</include>
+                <include>*.sh</include>
+                <include>*.bat</include>
+            </includes>
         </fileSet>
     </fileSets>
-    <!-- This will scrub your dependencies and add them to your lib folder, I excluded
-         Test stuff as it is not needed, could have declared the resource as a test
-         only phase as well would not have had to exclude it here
-    -->
     <dependencySets>
         <dependencySet>
-                <outputDirectory>lib</outputDirectory>                  
-                <excludes>
-                        <exclude>junit:junit</exclude>
-                </excludes>
+            <outputDirectory>lib</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useProjectArtifact>true</useProjectArtifact>
         </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/coreserver/CoreServerLauncher.sh b/coreserver/CoreServerLauncher.sh
deleted file mode 100644
index dae9dd976..000000000
--- a/coreserver/CoreServerLauncher.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -server -Xms1024m -Xmx1024m -XX:+CMSParallelRemarkEnabled -XX:+CMSScavengeBeforeRemark -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=50 -XX:CMSWaitDuration=300000 -XX:GCTimeRatio=40 -XX:MaxPermSize=256m -classpath '.:lib/*' -DEDDI_ENV=production io.sls.core.CoreServer
diff --git a/coreserver/CoreServerStartup.bat b/coreserver/CoreServerStartup.bat
index 22af43496..4a250f8b3 100644
--- a/coreserver/CoreServerStartup.bat
+++ b/coreserver/CoreServerStartup.bat
@@ -1 +1,32 @@
-java -classpath ".;lib\*" -DEDDI_ENV=production io.sls.core.CoreServer
+@echo off
+if [%1] == [] (
+    echo "Usage: <environment> [rmi-server-hostname]"
+    goto end
+)
+
+if  %1==production (
+SET JAVA_OPTS= ^
+        -server -Xms1024m -Xmx1024m ^
+        -XX:+UseConcMarkSweepGC ^
+        -XX:+CMSParallelRemarkEnabled ^
+        -XX:+UseCMSInitiatingOccupancyOnly ^
+        -XX:CMSInitiatingOccupancyFraction=50 ^
+        -XX:CMSWaitDuration=300000 ^
+        -XX:+CMSScavengeBeforeRemark ^
+        -XX:+ScavengeBeforeFullGC ^
+        -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:gc.log ^
+        -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M ^
+        -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=`date`.hprof ^
+        -Djava.rmi.server.hostname=%2 ^
+        -Dcom.sun.management.jmxremote.port=9010 ^
+        -Dcom.sun.management.jmxremote.authenticate=false ^
+        -Dcom.sun.management.jmxremote.ssl=false
+) else if %1==development (
+	SET JAVA_OPTS=
+) else (
+	echo "Invalid environment %1"
+	goto end
+)
+
+java %JAVA_OPTS% -classpath .;lib/* -DEDDI_ENV=%1 io.sls.core.CoreServer
+:end
\ No newline at end of file
diff --git a/coreserver/CoreServerStartup.sh b/coreserver/CoreServerStartup.sh
index 72cec0286..8102a5722 100644
--- a/coreserver/CoreServerStartup.sh
+++ b/coreserver/CoreServerStartup.sh
@@ -1,2 +1,34 @@
-#!/bin/sh
-java -classpath '.:lib/*' -DEDDI_ENV=production io.sls.core.CoreServer
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    echo "Usage: <environment> [rmi-server-hostname]"
+    exit
+fi
+
+if [ "$1" = "production" ]; then
+
+read -d '' JAVA_OPTS <<EOF
+        -server -Xms1024m -Xmx1024m
+        -XX:+UseConcMarkSweepGC
+        -XX:+CMSParallelRemarkEnabled
+        -XX:+UseCMSInitiatingOccupancyOnly
+        -XX:CMSInitiatingOccupancyFraction=50
+        -XX:CMSWaitDuration=300000
+        -XX:+CMSScavengeBeforeRemark
+        -XX:+ScavengeBeforeFullGC
+        -XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:/var/log/gc.log
+        -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M
+        -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/eddi/`date`.hprof
+        -Djava.rmi.server.hostname=$2
+        -Dcom.sun.management.jmxremote.port=9010
+        -Dcom.sun.management.jmxremote.authenticate=false
+        -Dcom.sun.management.jmxremote.ssl=false
+EOF
+
+elif [ "$1" = "development" ]; then
+    JAVA_OPTS=""
+else
+    echo "Invalid environment $1"
+    exit
+fi
+java $JAVA_OPTS -classpath '.:lib/*' -DEDDI_ENV=$1 io.sls.core.CoreServer
\ No newline at end of file
diff --git a/coreserver/pom.xml b/coreserver/pom.xml
index 2ccd80896..2b9e1bcd4 100644
--- a/coreserver/pom.xml
+++ b/coreserver/pom.xml
@@ -203,7 +203,7 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>install</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
diff --git a/coreserver/src/assembly/assembly.xml b/coreserver/src/assembly/assembly.xml
index 9f703e794..c392211b8 100644
--- a/coreserver/src/assembly/assembly.xml
+++ b/coreserver/src/assembly/assembly.xml
@@ -11,24 +11,19 @@
         <fileSet>
             <outputDirectory>/</outputDirectory>
             <includes>
-                <include>config/*.*</include>
+                <include>config/**/*.*</include>
                 <include>resources/**/*.*</include>
-                <include>keystore/*.*</include>
                 <include>*.sh</include>
                 <include>*.bat</include>
             </includes>
         </fileSet>
     </fileSets>
-    <!-- This will scrub your dependencies and add them to your lib folder, I excluded
-         Test stuff as it is not needed, could have declared the resource as a test
-         only phase as well would not have had to exclude it here
-    -->
     <dependencySets>
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
-            <excludes>
-                <exclude>junit:junit</exclude>
-            </excludes>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useProjectArtifact>true</useProjectArtifact>
         </dependencySet>
     </dependencySets>
 </assembly>