diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..29abf99
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..714351a
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/pom.xml b/pom.xml
index 77ca9d3..a231f03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,38 +108,79 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- Test Dependencies -->
+		<!-- Test Dependencies. Setting scope to provided to allow proper creation of uber-jar -->
 		<dependency>
 			<groupId>org.gcube.vremanagement</groupId>
 			<artifactId>smart-executor-client</artifactId>
-			<scope>test</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.11</version>
-			<scope>test</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<scope>test</scope>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<excludeScope>provided</excludeScope>
+							<outputDirectory>${basedir}${file.separator}target${file.separator}libs</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>false</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<excludeTypes>war</excludeTypes>
+							<stripVersion>false</stripVersion>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>make-uberjar</id>
+						<id>uberjar</id>
+						<configuration>
+							<appendAssemblyId>true</appendAssemblyId>
+							<descriptors>
+								<descriptor>uberjar-no-provided-deps.xml</descriptor>
+							</descriptors>
+						</configuration>
 						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
 					</execution>
 					<execution>
-						<id>make-servicearchive</id>
+						<id>tar.gz</id>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>tar-gz-no-provided-deps.xml</descriptor>
+							</descriptors>
+						</configuration>
 						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/tar-gz-no-provided-deps.xml b/tar-gz-no-provided-deps.xml
new file mode 100644
index 0000000..e41c0e6
--- /dev/null
+++ b/tar-gz-no-provided-deps.xml
@@ -0,0 +1,24 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>tar.gz</id>
+	<formats>
+		<format>tar.gz</format>
+	</formats>
+	<baseDirectory>${file.separator}</baseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>target${file.separator}libs</directory>
+			<outputDirectory>${file.separator}</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<fileMode>755</fileMode>
+		</fileSet>
+	</fileSets>
+	<files>
+		<file>
+			<source>target${file.separator}${project.artifactId}-${project.version}.jar</source>
+			<filtered>true</filtered>
+		</file>
+	</files>
+</assembly>
\ No newline at end of file
diff --git a/uberjar-no-provided-deps.xml b/uberjar-no-provided-deps.xml
new file mode 100644
index 0000000..5348cf9
--- /dev/null
+++ b/uberjar-no-provided-deps.xml
@@ -0,0 +1,24 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>uberjar</id>
+	<formats>
+		<format>jar</format>
+	</formats>
+	<baseDirectory>${file.separator}</baseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>target${file.separator}libs</directory>
+			<outputDirectory>${file.separator}</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<fileMode>755</fileMode>
+		</fileSet>
+		<fileSet>
+			<directory>target${file.separator}classes</directory>
+			<outputDirectory>${file.separator}</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<fileMode>755</fileMode>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file