diff --git a/MediaServiceCore b/MediaServiceCore
index 81bd674b4..2a61ecac3 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 81bd674b48d9d9ef56cc2075b514d405b9eed8b2
+Subproject commit 2a61ecac33e93a3fb2b3b71586695cd1fafbbd67
diff --git a/SharedModules b/SharedModules
index bb5ed8007..40404ad75 160000
--- a/SharedModules
+++ b/SharedModules
@@ -1 +1 @@
-Subproject commit bb5ed8007063f2db7efd7afc2884c48c393c31e6
+Subproject commit 40404ad75c4210d755c56f6a6d190091da9f5e4a
diff --git a/build.gradle b/build.gradle
index 96743f8b3..43068489c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,5 +18,6 @@ allprojects {
         google()
         mavenCentral()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
 }
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
index 5a62e0f2b..d52d313d9 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -57,9 +57,12 @@ dependencies {
 
     implementation 'com.amazon.android:exoplayer:' + amazonExoplayerVersion
     implementation 'com.amazon.android:extension-okhttp:' + amazonExoplayerVersion
+
     // implementation 'com.google.android.exoplayer:exoplayer:' + exoplayerVersion
     // implementation 'com.google.android.exoplayer:extension-okhttp:' + exoplayerVersion
 
+    // implementation 'com.github.amzn:exoplayer-amazon-port:' + amazonExoplayerJitpackVersion
+
     implementation 'androidx.media:media:' + mediaXLibraryVersion // exoplayer fix
 
     implementation 'com.github.bumptech.glide:glide:' + glideVersion
diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
index 3bc46a49d..24c2514c6 100644
--- a/smarttubetv/build.gradle
+++ b/smarttubetv/build.gradle
@@ -127,9 +127,12 @@ dependencies {
 
     implementation 'com.amazon.android:exoplayer:' + amazonExoplayerVersion
     implementation 'com.amazon.android:extension-leanback:' + amazonExoplayerVersion
+
     // implementation 'com.google.android.exoplayer:exoplayer:' + exoplayerVersion
     // implementation 'com.google.android.exoplayer:extension-leanback:' + exoplayerVersion
 
+    // implementation 'com.github.amzn:exoplayer-amazon-port:' + amazonExoplayerJitpackVersion
+
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     androidTestImplementation 'androidx.test.ext:junit:' + testXSupportLibraryVersion