diff --git a/airbyte-server/Dockerfile b/airbyte-server/Dockerfile
index 22d929e0b9ba..00cc657e2ba0 100644
--- a/airbyte-server/Dockerfile
+++ b/airbyte-server/Dockerfile
@@ -6,7 +6,7 @@ ENV APPLICATION airbyte-server
 
 WORKDIR /app
 
-COPY build/distributions/${APPLICATION}*.tar ${APPLICATION}.tar
+COPY build/distributions/${APPLICATION}-0*.tar ${APPLICATION}.tar
 
 RUN mkdir latest_seeds
 COPY build/config_init/resources/main/config latest_seeds
diff --git a/airbyte-server/build.gradle b/airbyte-server/build.gradle
index 92f5348279be..1a72fea9eeac 100644
--- a/airbyte-server/build.gradle
+++ b/airbyte-server/build.gradle
@@ -1,5 +1,28 @@
 plugins {
     id 'application'
+    id 'maven-publish'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
+}
+
+shadowJar {
+    zip64 true
+    mergeServiceFiles()
+    exclude 'META-INF/*.RSA'
+    exclude 'META-INF/*.SF'
+    exclude 'META-INF/*.DSA'
+    // Not stubbing this out adds 'all' to the end of the jar's name.
+    classifier = ''
+}
+
+publishing {
+    publications {
+        shadow(MavenPublication) { publication ->
+            project.shadow.component(publication)
+        }
+    }
+    repositories {
+        mavenLocal()
+    }
 }
 
 dependencies {
@@ -52,8 +75,10 @@ task copySeed(type: Copy, dependsOn: [project(':airbyte-config:init').processRes
 //project.tasks.copySeed.mustRunAfter(project(':airbyte-config:init').tasks.processResources)
 assemble.dependsOn(project.tasks.copySeed)
 
+mainClassName = 'io.airbyte.server.ServerApp'
+
 application {
-    mainClass = 'io.airbyte.server.ServerApp'
+    mainClass = mainClassName
 }
 
 Properties env = new Properties()