diff --git a/build/bintray-config.template b/build/bintray-config.template
deleted file mode 100644
index 4a84b42abd6..00000000000
--- a/build/bintray-config.template
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "package": {
-    "vcs_url": "https://github.com/IBM/FHIR.git",
-    "repo": "${BINTRAY_REPO_NAME}",
-    "issue_tracker_url": "https://github.com/IBM/FHIR/issues",
-    "subject": "${BINTRAY_REPO_OWNER}",
-    "website_url": "https://github.com/IBM/FHIR",
-    "name": "${BINTRAY_PKG_NAME}"
-  },
-
-  "version": {
-    "name": "${TRAVIS_TAG}"
-  },
- 
-  "files": [
-    {
-      "includePattern": "target/fhir-${TRAVIS_TAG}.jar",
-      "uploadPattern": "com/ibm/fhir/${TRAVIS_TAG}/fhir-core-${TRAVIS_TAG}.jar"
-    },
-    {
-      "includePattern": "target/fhir-${TRAVIS_TAG}-sources.jar",
-      "uploadPattern": "com/ibm/fhir${TRAVIS_TAG}/fhir-core-${TRAVIS_TAG}-sources.jar"
-    },
-    {
-      "includePattern": "target/fhir-${TRAVIS_TAG}-javadoc.jar",
-      "uploadPattern": "com/ibm/fhir${TRAVIS_TAG}/fhir-${TRAVIS_TAG}-javadoc.jar"
-    },
-    {
-      "includePattern": "pom.xml",
-      "uploadPattern": "com/ibm/fhir${TRAVIS_TAG}/fhir-core-${TRAVIS_TAG}.pom"
-    }
-  ],
-  
-  "publish": true
-}
diff --git a/build/bintray/config.template b/build/bintray/config.template
new file mode 100644
index 00000000000..ee5d7455f5a
--- /dev/null
+++ b/build/bintray/config.template
@@ -0,0 +1,32 @@
+{
+  "package": {
+    "vcs_url": "https://github.com/IBM/FHIR.git",
+    "repo": "${BINTRAY_REPO_NAME}",
+    "issue_tracker_url": "https://github.com/IBM/FHIR/issues",
+    "subject": "${BINTRAY_REPO_OWNER}",
+    "website_url": "https://github.com/IBM/FHIR",
+    "name": "${BINTRAY_PKG_NAME}"
+  },
+  "version": {
+    "name": "${BINTRAY_VERSION}"
+  },
+  "files": [
+    {
+      "includePattern": "${MODULE}/target/${MODULE}.jar",
+      "uploadPattern": "${BINTRAY_PATH}/${MODULE}.jar"
+    },
+    {
+      "includePattern": "${MODULE}/target/${MODULE}-sources.jar",
+      "uploadPattern": "${BINTRAY_PATH}/${MODULE}-sources.jar"
+    },
+    {
+      "includePattern": "${MODULE}/target/${MODULE}-javadoc.jar",
+      "uploadPattern": "${BINTRAY_PATH}/${MODULE}-javadoc.jar"
+    },
+    {
+      "includePattern": "${MODULE}/pom.xml",
+      "uploadPattern": "${BINTRAY_PATH}/${MODULE}.pom"
+    }
+  ],
+  "publish": true
+}
\ No newline at end of file