diff --git a/.gitmodules b/.gitmodules
index 4b0cdba3b..c69a5408d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,3 @@
-[submodule "thirdparty/chewie"]
-	path = thirdparty/chewie
-	url = https://github.com/ente-io/chewie.git
-
-[submodule "thirdparty/plugins"]
-	path = thirdparty/plugins
-	url = https://github.com/ente-io/plugins.git
-
 [submodule "thirdparty/extended_image"]
     path = thirdparty/extended_image
     url = https://github.com/ente-io/extended_image.git
diff --git a/pubspec.lock b/pubspec.lock
index 71ee3c7a1..06431c84d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -244,10 +244,12 @@ packages:
   chewie:
     dependency: "direct main"
     description:
-      path: "thirdparty/chewie"
-      relative: true
-    source: path
-    version: "1.2.2"
+      path: "."
+      ref: forked_video_player
+      resolved-ref: "548fa399c76adc3f1a1c0f9d42fcac954cf0345d"
+      url: "https://github.com/ente-io/chewie.git"
+    source: git
+    version: "1.5.0"
   clock:
     dependency: transitive
     description:
@@ -1999,24 +2001,44 @@ packages:
   video_player:
     dependency: "direct main"
     description:
-      path: "thirdparty/plugins/packages/video_player/video_player"
-      relative: true
-    source: path
-    version: "2.2.5"
+      path: "packages/video_player/video_player"
+      ref: android_video_roation_fix
+      resolved-ref: a9be78ffe97b9335bcf865c72dae1ba361dad77f
+      url: "https://github.com/ente-io/packages.git"
+    source: git
+    version: "2.6.1"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      sha256: ae1c7d9a71c236a1bf9e567bd7ed4c90887e389a5f233b2192593f7f7395005c
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.8"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      sha256: "4c274e439f349a0ee5cb3c42978393ede173a443b98f50de6ffe6900eaa19216"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.6"
   video_player_platform_interface:
     dependency: transitive
     description:
-      path: "thirdparty/plugins/packages/video_player/video_player_platform_interface"
-      relative: true
-    source: path
-    version: "4.2.0"
+      name: video_player_platform_interface
+      sha256: a8c4dcae2a7a6e7cc1d7f9808294d968eca1993af34a98e95b9bdfa959bec684
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.0"
   video_player_web:
     dependency: transitive
     description:
-      path: "thirdparty/plugins/packages/video_player/video_player_web"
-      relative: true
-    source: path
-    version: "2.0.4"
+      name: video_player_web
+      sha256: "44ce41424d104dfb7cf6982cc6b84af2b007a24d126406025bf40de5d481c74c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.16"
   video_thumbnail:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 819f5ab67..1eb565de3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -26,7 +26,9 @@ dependencies:
   bip39: ^1.0.6
   cached_network_image: ^3.0.0
   chewie:
-    path: thirdparty/chewie
+    git:
+      url: https://github.com/ente-io/chewie.git
+      ref: forked_video_player
   collection: # dart
   computer:
     git: "https://github.com/ente-io/computer.git"
@@ -125,7 +127,10 @@ dependencies:
   url_launcher: ^6.0.3
   uuid: ^3.0.4
   video_player:
-    path: thirdparty/plugins/packages/video_player/video_player
+    git:
+      url: https://github.com/ente-io/packages.git
+      ref: android_video_roation_fix
+      path: packages/video_player/video_player/
   video_thumbnail: ^0.4.3
   visibility_detector: ^0.3.3
   wakelock: ^0.6.1+2
diff --git a/thirdparty/chewie b/thirdparty/chewie
deleted file mode 160000
index f56c85bdc..000000000
--- a/thirdparty/chewie
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f56c85bdcbaa0405f3e62a4408a7a5acbd31deb1
diff --git a/thirdparty/plugins b/thirdparty/plugins
deleted file mode 160000
index db016cc95..000000000
--- a/thirdparty/plugins
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit db016cc95c6337766617d644585a835f7693a7df