diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
index 90eaeddb..a4f22503 100644
--- a/app/android/app/src/main/AndroidManifest.xml
+++ b/app/android/app/src/main/AndroidManifest.xml
@@ -37,6 +37,18 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <!-- BEGIN receive deep links config -->
+            <meta-data android:name="flutter_deeplinking_enabled" android:value="true" />
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Agreed to use app ID but must not contain underscores -->
+                <data android:scheme="pharme" />
+                <!-- Host we agreed upon -->
+                <data android:host="open_file" />
+            </intent-filter>
+            <!-- END receive deep links config -->
         </activity>
         <!-- Used for Sign-In Flow -->
         <activity
diff --git a/app/lib/app.dart b/app/lib/app.dart
index 6c59547e..3311f6de 100644
--- a/app/lib/app.dart
+++ b/app/lib/app.dart
@@ -21,8 +21,23 @@ class PharMeApp extends StatelessWidget {
         appRouter: _appRouter,
         child: MaterialApp.router(
           debugShowCheckedModeBanner: false,
-          routeInformationParser: _appRouter.defaultRouteParser(),
-          routerDelegate: _appRouter.delegate(deepLinkBuilder: getInitialRoute),
+          routerConfig: _appRouter.config(
+            deepLinkBuilder: (deepLink) async {
+              final queryParameters = deepLink.uri.queryParameters;
+              final isDeepLinkShareRequest = deepLink.path == '' &&
+                queryParameters.containsKey('provider_url');
+              if (isDeepLinkShareRequest) {
+                MetaData.instance.deepLinkSharePublishUrl =
+                  queryParameters['provider_url'];
+                await MetaData.save();
+                if (_appRouter.currentPath != '/') {
+                  return DeepLink.path(_appRouter.currentPath);
+                }
+              }
+              // default route
+              return getInitialRoute();
+            },
+          ),
           theme: PharMeTheme.light,
           localizationsDelegates: [
             AppLocalizations.delegate,
diff --git a/app/lib/common/models/metadata.dart b/app/lib/common/models/metadata.dart
index cc82eafb..1e6d3034 100644
--- a/app/lib/common/models/metadata.dart
+++ b/app/lib/common/models/metadata.dart
@@ -46,6 +46,9 @@ class MetaData {
 
   @HiveField(5)
   bool? tutorialDone;
+
+  @HiveField(6)
+  String? deepLinkSharePublishUrl;
 }
 
 /// Initializes the user's metadata by registering all necessary adapters and
diff --git a/app/lib/common/utilities/routing_utils.dart b/app/lib/common/utilities/routing_utils.dart
index 18cfbdb0..cc7c84a9 100644
--- a/app/lib/common/utilities/routing_utils.dart
+++ b/app/lib/common/utilities/routing_utils.dart
@@ -1,7 +1,7 @@
 import '../../secure/module.dart';
 import '../module.dart';
 
-DeepLink getInitialRoute(_) {
+DeepLink getInitialRoute() {
   final isLoggedIn = MetaData.instance.isLoggedIn ?? false;
   final onboardingDone = MetaData.instance.onboardingDone ?? false;
   final initialDrugSelectionDone =
diff --git a/app/lib/login/models/deep_link_share_flow_lab.dart b/app/lib/login/models/deep_link_share_flow_lab.dart
index 735774ac..31225991 100644
--- a/app/lib/login/models/deep_link_share_flow_lab.dart
+++ b/app/lib/login/models/deep_link_share_flow_lab.dart
@@ -1,3 +1,5 @@
+import 'package:flutter/foundation.dart';
+
 import '../../common/module.dart';
 import 'lab.dart';
 
@@ -19,19 +21,24 @@ class DeepLinkShareFlowLab extends Lab {
   String? authLoadingMessage() =>
     'Please open the $shareAppName and share your data with PharMe';
 
+  Future<void> _waitForDeepLinkSharePublishUrl() async {
+    var waitingForDeepLinkSharePublishUrl = true;
+    while (waitingForDeepLinkSharePublishUrl) {
+      waitingForDeepLinkSharePublishUrl =
+        MetaData.instance.deepLinkSharePublishUrl == null;
+      await Future.delayed(Duration(seconds: 1));
+    }
+  }
+
   @override
   Future<void> authenticate() async {
-    // THIS IS FOR TESTING, SHOULD WAIT UNTIL A DEEP LINK IS RECEIVED
-    // (if possible like this but could set metadata field when deep link
-    // caught and wait here until it was set)
-    await Future.delayed(Duration(seconds: 7));
+    await _waitForDeepLinkSharePublishUrl();
   }
   
   @override
   Future<(List<LabResult>, List<String>)> loadData() async {
-    // THIS IS FOR TESTING, SHOULD GET FROM DWA
     publishUrl = Uri.parse(
-      'https://hpi-datastore.duckdns.org/userdata?id=1e006a69-b693-43d2-a318-22904e305b5c',
+      MetaData.instance.deepLinkSharePublishUrl!,
     );
     publishHeaders = null;
     return fetchData(
diff --git a/pharme.code-workspace b/pharme.code-workspace
index bfcd09fc..1d37b242 100644
--- a/pharme.code-workspace
+++ b/pharme.code-workspace
@@ -60,6 +60,7 @@
       "drugclass",
       "drugid",
       "drugrecommendation",
+      "drugselection",
       "duckdns",
       "duloxetine",
       "endoxifen",