diff --git a/apps/application-system/api/infra/application-system-api.ts b/apps/application-system/api/infra/application-system-api.ts
index c138e02c7c39..bc65f0bb4b7a 100644
--- a/apps/application-system/api/infra/application-system-api.ts
+++ b/apps/application-system/api/infra/application-system-api.ts
@@ -57,7 +57,7 @@ export const workerSetup =
         },
         XROAD_CHARGE_FJS_V2_PATH: {
           dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
-          staging: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
+          staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
           prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
         },
         APPLICATION_ATTACHMENT_BUCKET: {
diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
index 0e3398129682..4c407547d670 100644
--- a/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
+++ b/apps/judicial-system/web/src/routes/Court/Indictments/Completed/Completed.tsx
@@ -114,6 +114,9 @@ const Completed: FC = () => {
       CaseIndictmentRulingDecision.FINE,
     ].includes(workingCase.indictmentRulingDecision)
 
+  const isRuling =
+    workingCase.indictmentRulingDecision === CaseIndictmentRulingDecision.RULING
+
   const stepIsValid = () =>
     workingCase.indictmentRulingDecision === CaseIndictmentRulingDecision.RULING
       ? workingCase.defendants?.every(
@@ -150,134 +153,127 @@ const Completed: FC = () => {
         <Box marginBottom={5} component="section">
           <IndictmentCaseFilesList workingCase={workingCase} />
         </Box>
-        {!sentToPublicProsecutor && (
-          <>
-            {isRulingOrFine && (
-              <Box marginBottom={5} component="section">
-                <SectionHeading
-                  title={formatMessage(strings.criminalRecordUpdateTitle)}
-                />
-                <InputFileUpload
-                  fileList={uploadFiles.filter(
-                    (file) =>
-                      file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
-                  )}
-                  accept="application/pdf"
-                  header={formatMessage(core.uploadBoxTitle)}
-                  buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
-                  description={formatMessage(core.uploadBoxDescription, {
-                    fileEndings: '.pdf',
-                  })}
-                  onChange={handleCriminalRecordUpdateUpload}
-                  onRemove={handleRemoveFile}
-                />
-              </Box>
-            )}
-            {workingCase.indictmentRulingDecision ===
-              CaseIndictmentRulingDecision.RULING && (
-              <Box marginBottom={10}>
-                <SectionHeading
-                  title={formatMessage(strings.serviceRequirementTitle)}
-                />
-                {workingCase.defendants?.map((defendant, index) => (
-                  <Box
-                    key={defendant.id}
-                    component="section"
-                    marginBottom={
-                      workingCase.defendants &&
-                      workingCase.defendants.length - 1 === index
-                        ? 10
-                        : 3
-                    }
-                  >
-                    <BlueBox>
-                      <SectionHeading
-                        title={defendant.name || ''}
-                        marginBottom={2}
-                        heading="h4"
-                        required
-                      />
-                      <Box marginBottom={2}>
-                        <RadioButton
-                          id={`defendant-${defendant.id}-service-requirement-not-applicable`}
-                          name={`defendant-${defendant.id}-service-requirement`}
-                          checked={
-                            defendant.serviceRequirement ===
-                            ServiceRequirement.NOT_APPLICABLE
-                          }
-                          onChange={() => {
-                            setAndSendDefendantToServer(
-                              {
-                                defendantId: defendant.id,
-                                caseId: workingCase.id,
-                                serviceRequirement:
-                                  ServiceRequirement.NOT_APPLICABLE,
-                              },
-                              setWorkingCase,
-                            )
-                          }}
-                          large
-                          backgroundColor="white"
-                          label={formatMessage(
-                            strings.serviceRequirementNotApplicable,
-                          )}
-                        />
-                      </Box>
-                      <Box marginBottom={2}>
-                        <RadioButton
-                          id={`defendant-${defendant.id}-service-requirement-required`}
-                          name={`defendant-${defendant.id}-service-requirement`}
-                          checked={
-                            defendant.serviceRequirement ===
-                            ServiceRequirement.REQUIRED
-                          }
-                          onChange={() => {
-                            setAndSendDefendantToServer(
-                              {
-                                defendantId: defendant.id,
-                                caseId: workingCase.id,
-                                serviceRequirement: ServiceRequirement.REQUIRED,
-                              },
-                              setWorkingCase,
-                            )
-                          }}
-                          large
-                          backgroundColor="white"
-                          label={formatMessage(
-                            strings.serviceRequirementRequired,
-                          )}
-                        />
-                      </Box>
-                      <RadioButton
-                        id={`defendant-${defendant.id}-service-requirement-not-required`}
-                        name={`defendant-${defendant.id}-service-requirement`}
-                        checked={
-                          defendant.serviceRequirement ===
-                          ServiceRequirement.NOT_REQUIRED
-                        }
-                        onChange={() => {
-                          setAndSendDefendantToServer(
-                            {
-                              defendantId: defendant.id,
-                              caseId: workingCase.id,
-                              serviceRequirement:
-                                ServiceRequirement.NOT_REQUIRED,
-                            },
-                            setWorkingCase,
-                          )
-                        }}
-                        large
-                        backgroundColor="white"
-                        label={formatMessage(
-                          strings.serviceRequirementNotRequired,
-                        )}
-                      />
-                    </BlueBox>
+        {!sentToPublicProsecutor && isRulingOrFine && (
+          <Box marginBottom={isRuling ? 5 : 10} component="section">
+            <SectionHeading
+              title={formatMessage(strings.criminalRecordUpdateTitle)}
+            />
+            <InputFileUpload
+              fileList={uploadFiles.filter(
+                (file) =>
+                  file.category === CaseFileCategory.CRIMINAL_RECORD_UPDATE,
+              )}
+              accept="application/pdf"
+              header={formatMessage(core.uploadBoxTitle)}
+              buttonLabel={formatMessage(core.uploadBoxButtonLabel)}
+              description={formatMessage(core.uploadBoxDescription, {
+                fileEndings: '.pdf',
+              })}
+              onChange={handleCriminalRecordUpdateUpload}
+              onRemove={handleRemoveFile}
+            />
+          </Box>
+        )}
+        {isRuling && (
+          <Box marginBottom={10} component="section">
+            <SectionHeading
+              title={formatMessage(strings.serviceRequirementTitle)}
+            />
+            {workingCase.defendants?.map((defendant, index) => (
+              <Box
+                key={defendant.id}
+                component="section"
+                marginBottom={
+                  workingCase.defendants &&
+                  workingCase.defendants.length - 1 === index
+                    ? 10
+                    : 3
+                }
+              >
+                <BlueBox>
+                  <SectionHeading
+                    title={defendant.name || ''}
+                    marginBottom={2}
+                    heading="h4"
+                    required
+                  />
+                  <Box marginBottom={2}>
+                    <RadioButton
+                      id={`defendant-${defendant.id}-service-requirement-not-applicable`}
+                      name={`defendant-${defendant.id}-service-requirement`}
+                      checked={
+                        defendant.serviceRequirement ===
+                        ServiceRequirement.NOT_APPLICABLE
+                      }
+                      disabled={sentToPublicProsecutor}
+                      onChange={() => {
+                        setAndSendDefendantToServer(
+                          {
+                            defendantId: defendant.id,
+                            caseId: workingCase.id,
+                            serviceRequirement:
+                              ServiceRequirement.NOT_APPLICABLE,
+                          },
+                          setWorkingCase,
+                        )
+                      }}
+                      large
+                      backgroundColor="white"
+                      label={formatMessage(
+                        strings.serviceRequirementNotApplicable,
+                      )}
+                    />
+                  </Box>
+                  <Box marginBottom={2}>
+                    <RadioButton
+                      id={`defendant-${defendant.id}-service-requirement-required`}
+                      name={`defendant-${defendant.id}-service-requirement`}
+                      checked={
+                        defendant.serviceRequirement ===
+                        ServiceRequirement.REQUIRED
+                      }
+                      disabled={sentToPublicProsecutor}
+                      onChange={() => {
+                        setAndSendDefendantToServer(
+                          {
+                            defendantId: defendant.id,
+                            caseId: workingCase.id,
+                            serviceRequirement: ServiceRequirement.REQUIRED,
+                          },
+                          setWorkingCase,
+                        )
+                      }}
+                      large
+                      backgroundColor="white"
+                      label={formatMessage(strings.serviceRequirementRequired)}
+                    />
                   </Box>
-                ))}
+                  <RadioButton
+                    id={`defendant-${defendant.id}-service-requirement-not-required`}
+                    name={`defendant-${defendant.id}-service-requirement`}
+                    checked={
+                      defendant.serviceRequirement ===
+                      ServiceRequirement.NOT_REQUIRED
+                    }
+                    disabled={sentToPublicProsecutor}
+                    onChange={() => {
+                      setAndSendDefendantToServer(
+                        {
+                          defendantId: defendant.id,
+                          caseId: workingCase.id,
+                          serviceRequirement: ServiceRequirement.NOT_REQUIRED,
+                        },
+                        setWorkingCase,
+                      )
+                    }}
+                    large
+                    backgroundColor="white"
+                    label={formatMessage(strings.serviceRequirementNotRequired)}
+                  />
+                </BlueBox>
               </Box>
-            )}
-          </>
+            ))}
+          </Box>
         )}
       </FormContentContainer>
       <FormContentContainer isFooter>
diff --git a/apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans-Regular.ttf b/apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans.ttf
similarity index 100%
rename from apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans-Regular.ttf
rename to apps/native/app/android/app/src/main/assets/fonts/IBMPlexSans.ttf
diff --git a/apps/native/app/assets/fonts/IBMPlexSans.ttf b/apps/native/app/assets/fonts/IBMPlexSans.ttf
new file mode 100644
index 000000000000..702c637f51ed
Binary files /dev/null and b/apps/native/app/assets/fonts/IBMPlexSans.ttf differ
diff --git a/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj b/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
index 2c9b5ace6acf..b13fc775ca43 100644
--- a/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
+++ b/apps/native/app/ios/IslandApp.xcodeproj/project.pbxproj
@@ -24,7 +24,7 @@
 		E367D440298DF24D007054A4 /* IBMPlexSans-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D432298DF24C007054A4 /* IBMPlexSans-LightItalic.ttf */; };
 		E367D441298DF24D007054A4 /* IBMPlexSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D433298DF24C007054A4 /* IBMPlexSans-Light.ttf */; };
 		E367D442298DF24D007054A4 /* IBMPlexSans-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D434298DF24C007054A4 /* IBMPlexSans-ExtraLight.ttf */; };
-		E367D443298DF24D007054A4 /* IBMPlexSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D435298DF24C007054A4 /* IBMPlexSans-Regular.ttf */; };
+		E367D443298DF24D007054A4 /* IBMPlexSans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D435298DF24C007054A4 /* IBMPlexSans.ttf */; };
 		E367D444298DF24D007054A4 /* IBMPlexSans-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D436298DF24D007054A4 /* IBMPlexSans-Thin.ttf */; };
 		E367D445298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D437298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf */; };
 		E367D446298DF24D007054A4 /* IBMPlexSans-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E367D438298DF24D007054A4 /* IBMPlexSans-Medium.ttf */; };
@@ -48,7 +48,7 @@
 		5BD3F84B09D28615BB8D415C /* Pods-IslandApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IslandApp.release.xcconfig"; path = "Target Support Files/Pods-IslandApp/Pods-IslandApp.release.xcconfig"; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = IslandApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		8DCA6BB3F9BC0A645D723048 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-IslandApp/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
-		941A2A9F3CFC44F91E0A673C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = IslandApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		941A2A9F3CFC44F91E0A673C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = IslandApp/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		E367D422298A854E007054A4 /* IslandApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "IslandApp-Bridging-Header.h"; sourceTree = "<group>"; };
 		E367D423298A854E007054A4 /* noop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = noop.swift; sourceTree = "<group>"; };
 		E367D425298AB63B007054A4 /* RNIsland.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNIsland.m; sourceTree = "<group>"; };
@@ -63,7 +63,7 @@
 		E367D432298DF24C007054A4 /* IBMPlexSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-LightItalic.ttf"; path = "../../assets/fonts/IBMPlexSans-LightItalic.ttf"; sourceTree = "<group>"; };
 		E367D433298DF24C007054A4 /* IBMPlexSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Light.ttf"; path = "../../assets/fonts/IBMPlexSans-Light.ttf"; sourceTree = "<group>"; };
 		E367D434298DF24C007054A4 /* IBMPlexSans-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-ExtraLight.ttf"; path = "../../assets/fonts/IBMPlexSans-ExtraLight.ttf"; sourceTree = "<group>"; };
-		E367D435298DF24C007054A4 /* IBMPlexSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Regular.ttf"; path = "../../assets/fonts/IBMPlexSans-Regular.ttf"; sourceTree = "<group>"; };
+		E367D435298DF24C007054A4 /* IBMPlexSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = IBMPlexSans.ttf; path = ../../assets/fonts/IBMPlexSans.ttf; sourceTree = "<group>"; };
 		E367D436298DF24D007054A4 /* IBMPlexSans-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Thin.ttf"; path = "../../assets/fonts/IBMPlexSans-Thin.ttf"; sourceTree = "<group>"; };
 		E367D437298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-MediumItalic.ttf"; path = "../../assets/fonts/IBMPlexSans-MediumItalic.ttf"; sourceTree = "<group>"; };
 		E367D438298DF24D007054A4 /* IBMPlexSans-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "IBMPlexSans-Medium.ttf"; path = "../../assets/fonts/IBMPlexSans-Medium.ttf"; sourceTree = "<group>"; };
@@ -189,7 +189,7 @@
 				E367D432298DF24C007054A4 /* IBMPlexSans-LightItalic.ttf */,
 				E367D438298DF24D007054A4 /* IBMPlexSans-Medium.ttf */,
 				E367D437298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf */,
-				E367D435298DF24C007054A4 /* IBMPlexSans-Regular.ttf */,
+				E367D435298DF24C007054A4 /* IBMPlexSans.ttf */,
 				E367D42F298DF24C007054A4 /* IBMPlexSans-SemiBold.ttf */,
 				E367D42D298DF24C007054A4 /* IBMPlexSans-SemiBoldItalic.ttf */,
 				E367D436298DF24D007054A4 /* IBMPlexSans-Thin.ttf */,
@@ -269,7 +269,7 @@
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				E367D43C298DF24D007054A4 /* IBMPlexSans-BoldItalic.ttf in Resources */,
 				E367D445298DF24D007054A4 /* IBMPlexSans-MediumItalic.ttf in Resources */,
-				E367D443298DF24D007054A4 /* IBMPlexSans-Regular.ttf in Resources */,
+				E367D443298DF24D007054A4 /* IBMPlexSans.ttf in Resources */,
 				E367D43E298DF24D007054A4 /* IBMPlexSans-ThinItalic.ttf in Resources */,
 				E367D444298DF24D007054A4 /* IBMPlexSans-Thin.ttf in Resources */,
 				E367D442298DF24D007054A4 /* IBMPlexSans-ExtraLight.ttf in Resources */,
@@ -550,10 +550,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -625,10 +622,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -748,10 +742,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
diff --git a/apps/native/app/src/stores/auth-store.ts b/apps/native/app/src/stores/auth-store.ts
index 790f93c9a579..3091123afcf8 100644
--- a/apps/native/app/src/stores/auth-store.ts
+++ b/apps/native/app/src/stores/auth-store.ts
@@ -68,31 +68,21 @@ const getAppAuthConfig = () => {
   }
 }
 
-const clearPasskey = async (userNationalId?: string) => {
+const clearPasskey = async () => {
   // Clear passkey if exists
-  const isPasskeyEnabled = await featureFlagClient?.getValueAsync(
-    'isPasskeyEnabled',
-    false,
-    userNationalId ? { identifier: userNationalId } : undefined,
-  )
-  if (isPasskeyEnabled) {
-    preferencesStore.setState({
-      hasCreatedPasskey: false,
-      hasOnboardedPasskeys: false,
-      lastUsedPasskey: 0,
-    })
+  preferencesStore.setState({
+    hasCreatedPasskey: false,
+    hasOnboardedPasskeys: false,
+    lastUsedPasskey: 0,
+  })
 
-    const client = await getApolloClientAsync()
-    try {
-      await client.mutate<
-        DeletePasskeyMutation,
-        DeletePasskeyMutationVariables
-      >({
-        mutation: DeletePasskeyDocument,
-      })
-    } catch (e) {
-      console.error('Failed to delete passkey', e)
-    }
+  const client = await getApolloClientAsync()
+  try {
+    await client.mutate<DeletePasskeyMutation, DeletePasskeyMutationVariables>({
+      mutation: DeletePasskeyDocument,
+    })
+  } catch (e) {
+    console.error('Failed to delete passkey', e)
   }
 }
 
@@ -198,8 +188,7 @@ export const authStore = create<AuthStore>((set, get) => ({
     notificationsStore.getState().reset()
 
     // Clear passkey if exists
-    const userNationalId = get().userInfo?.nationalId
-    await clearPasskey(userNationalId)
+    await clearPasskey()
 
     const appAuthConfig = getAppAuthConfig()
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml
index 6fc006c8aa0e..31a5b14430bb 100644
--- a/charts/islandis/values.staging.yaml
+++ b/charts/islandis/values.staging.yaml
@@ -829,7 +829,7 @@ application-system-api-worker:
     SERVERSIDE_FEATURES_ON: ''
     XROAD_BASE_PATH: 'http://securityserver.staging01.devland.is'
     XROAD_BASE_PATH_WITH_ENV: 'http://securityserver.staging01.devland.is/r1/IS-TEST'
-    XROAD_CHARGE_FJS_V2_PATH: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2'
+    XROAD_CHARGE_FJS_V2_PATH: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2'
     XROAD_CLIENT_ID: 'IS-TEST/GOV/5501692829/island-is-client'
     XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
     XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/'