diff --git a/LoopCaregiver/LoopCaregiver.xcodeproj/project.pbxproj b/LoopCaregiver/LoopCaregiver.xcodeproj/project.pbxproj
index 33e2602..e505329 100644
--- a/LoopCaregiver/LoopCaregiver.xcodeproj/project.pbxproj
+++ b/LoopCaregiver/LoopCaregiver.xcodeproj/project.pbxproj
@@ -162,6 +162,7 @@
 		A9D2B8272A2CAFD500826490 /* LocalizationUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97B729B293E83BA0053DBB8 /* LocalizationUtils.swift */; };
 		A9D3FF222A6C3B99000C891D /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D3FF212A6C3B99000C891D /* Color.swift */; };
 		A9D3FF242A6C3C54000C891D /* HKUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9D3FF232A6C3C54000C891D /* HKUnit.swift */; };
+		A9E14D3A2A2BA5A600BDB93D /* LoopCaregiverWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A99F2F362A29350C00F7DE2D /* LoopCaregiverWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A9E14D3F2A2BB18500BDB93D /* LatestGlucoseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9E14D3E2A2BB18500BDB93D /* LatestGlucoseView.swift */; };
 		A9EC197C291FEF940022D39F /* LoopCaregiverApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9EC197B291FEF940022D39F /* LoopCaregiverApp.swift */; };
 		A9EC197E291FEF940022D39F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9EC197D291FEF940022D39F /* ContentView.swift */; };
@@ -180,6 +181,7 @@
 		A9EFD0042AE093F9008D63EC /* DeepLinkParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9EFCFFF2ADF6A01008D63EC /* DeepLinkParser.swift */; };
 		A9F871202A2EBE63007EC235 /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9F8711F2A2EBE63007EC235 /* Intents.framework */; };
 		A9F871232A2EBE63007EC235 /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9F871222A2EBE63007EC235 /* IntentHandler.swift */; };
+		A9F871382A2EBE64007EC235 /* LoopCaregiverIntentExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A9F8711E2A2EBE63007EC235 /* LoopCaregiverIntentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A9F8713F2A2EBE79007EC235 /* LoopCaregiverWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = A99F2F422A29350D00F7DE2D /* LoopCaregiverWidget.intentdefinition */; };
 		A9F871402A2FF2F5007EC235 /* CoreDataAccountService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9972773292FC0B0006C8C74 /* CoreDataAccountService.swift */; };
 		A9F871412A2FF2F5007EC235 /* AccountService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96929902927FFBA00B8BF43 /* AccountService.swift */; };
@@ -222,6 +224,20 @@
 			remoteGlobalIDString = A9EC1977291FEF940022D39F;
 			remoteInfo = LoopCaregiver;
 		};
+		A9E14D382A2BA59C00BDB93D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9EC1970291FEF940022D39F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A99F2F352A29350C00F7DE2D;
+			remoteInfo = LoopCaregiverWidgetExtension;
+		};
+		A9F871362A2EBE64007EC235 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9EC1970291FEF940022D39F /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9F8711D2A2EBE63007EC235;
+			remoteInfo = MyIntentExtension;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -244,6 +260,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
+				A9F871382A2EBE64007EC235 /* LoopCaregiverIntentExtension.appex in Embed Foundation Extensions */,
+				A9E14D3A2A2BA5A600BDB93D /* LoopCaregiverWidgetExtension.appex in Embed Foundation Extensions */,
 			);
 			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -827,6 +845,8 @@
 			buildRules = (
 			);
 			dependencies = (
+				A9E14D392A2BA59C00BDB93D /* PBXTargetDependency */,
+				A9F871372A2EBE64007EC235 /* PBXTargetDependency */,
 			);
 			name = LoopCaregiver;
 			packageProductDependencies = (
@@ -1168,6 +1188,16 @@
 			target = A9EC1977291FEF940022D39F /* LoopCaregiver */;
 			targetProxy = A9346F872AC9820500C15F70 /* PBXContainerItemProxy */;
 		};
+		A9E14D392A2BA59C00BDB93D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A99F2F352A29350C00F7DE2D /* LoopCaregiverWidgetExtension */;
+			targetProxy = A9E14D382A2BA59C00BDB93D /* PBXContainerItemProxy */;
+		};
+		A9F871372A2EBE64007EC235 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9F8711D2A2EBE63007EC235 /* LoopCaregiverIntentExtension */;
+			targetProxy = A9F871362A2EBE64007EC235 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/LoopCaregiver/LoopCaregiver/LoopCaregiver.entitlements b/LoopCaregiver/LoopCaregiver/LoopCaregiver.entitlements
index 6631ffa..d9849a8 100644
--- a/LoopCaregiver/LoopCaregiver/LoopCaregiver.entitlements
+++ b/LoopCaregiver/LoopCaregiver/LoopCaregiver.entitlements
@@ -2,5 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
+	</array>
 </dict>
 </plist>
diff --git a/LoopCaregiver/LoopCaregiverIntentExtension/LoopCaregiverIntentExtension.entitlements b/LoopCaregiver/LoopCaregiverIntentExtension/LoopCaregiverIntentExtension.entitlements
index 6631ffa..d9849a8 100644
--- a/LoopCaregiver/LoopCaregiverIntentExtension/LoopCaregiverIntentExtension.entitlements
+++ b/LoopCaregiver/LoopCaregiverIntentExtension/LoopCaregiverIntentExtension.entitlements
@@ -2,5 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
+	</array>
 </dict>
 </plist>
diff --git a/LoopCaregiver/LoopCaregiverWidgetExtension/LoopCaregiverWidgetExtension.entitlements b/LoopCaregiver/LoopCaregiverWidgetExtension/LoopCaregiverWidgetExtension.entitlements
index 6631ffa..d9849a8 100644
--- a/LoopCaregiver/LoopCaregiverWidgetExtension/LoopCaregiverWidgetExtension.entitlements
+++ b/LoopCaregiver/LoopCaregiverWidgetExtension/LoopCaregiverWidgetExtension.entitlements
@@ -2,5 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
+	</array>
 </dict>
 </plist>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 59102c7..a28a567 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -56,8 +56,8 @@ platform :ios do
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
         "com.#{TEAMID}.loopkit.LoopCaregiver",
-        #"com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension",
-        #"com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension"
+        "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension",
+        "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension"
       ]
     )
 
@@ -84,19 +84,19 @@ platform :ios do
       targets: ["LoopCaregiver"]
     )
 
-    #update_code_signing_settings(
-    #  path: "#{GITHUB_WORKSPACE}/LoopCaregiver/LoopCaregiver.xcodeproj",
-    #  profile_name: mapping["com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension"],
-    #  code_sign_identity: "iPhone Distribution",
-    #  targets: ["LoopCaregiverIntentExtension"]
-    #)
+    update_code_signing_settings(
+      path: "#{GITHUB_WORKSPACE}/LoopCaregiver/LoopCaregiver.xcodeproj",
+      profile_name: mapping["com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension"],
+      code_sign_identity: "iPhone Distribution",
+      targets: ["LoopCaregiverIntentExtension"]
+    )
 
-    #update_code_signing_settings(
-    #  path: "#{GITHUB_WORKSPACE}/LoopCaregiver/LoopCaregiver.xcodeproj",
-    #  profile_name: mapping["com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension"],
-    #  code_sign_identity: "iPhone Distribution",
-    #  targets: ["LoopCaregiverWidgetExtension"]
-    #)
+    update_code_signing_settings(
+      path: "#{GITHUB_WORKSPACE}/LoopCaregiver/LoopCaregiver.xcodeproj",
+      profile_name: mapping["com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension"],
+      code_sign_identity: "iPhone Distribution",
+      targets: ["LoopCaregiverWidgetExtension"]
+    )
 
     gym(
       export_method: "app-store",
@@ -148,16 +148,16 @@ platform :ios do
     end
 
     configure_bundle_id("LoopCaregiver", "com.#{TEAMID}.loopkit.LoopCaregiver", [
-      #Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
+      Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
     ])
 
-    #configure_bundle_id("LoopCaregiverIntentExtension", "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension", [
-      #Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
-    #])
+    configure_bundle_id("LoopCaregiverIntentExtension", "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension", [
+      Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
+    ])
 
-    #configure_bundle_id("LoopCaregiverWidgetExtension", "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension", [
-      #Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
-    #])
+    configure_bundle_id("LoopCaregiverWidgetExtension", "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension", [
+      Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
+    ])
 
   end
 
@@ -178,8 +178,8 @@ platform :ios do
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
         "com.#{TEAMID}.loopkit.LoopCaregiver",
-        #"com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension",
-        #"com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension",
+        "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverIntentExtension",
+        "com.#{TEAMID}.loopkit.LoopCaregiver.LoopCaregiverWidgetExtension",
       ]
     )
   end