diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7c2fed..d25cdaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,3 @@ release:
           url: "https://git.karaolidis.com/karaolidis/terminally-online/-/jobs/$JOB_ID/artifacts/raw/android/app/build/outputs/apk/release/app-release.apk"
   only:
     - tags
-
-include:
-  - template: Security/SAST.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2214d0c..04e7baf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
   "editor.tabSize": 2,
-  "java.configuration.updateBuildConfiguration": "automatic"
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.compile.nullAnalysis.mode": "automatic"
 }
diff --git a/src/app.tsx b/src/app.tsx
index 54fbf8f..593e0d8 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -52,7 +52,11 @@ const App = () => {
                 barStyle={isDarkMode ? 'light-content' : 'dark-content'}
                 backgroundColor={theme.colors.background}
               />
-              {showWelcome ? <Welcome /> : <NavigationContainer />}
+              {showWelcome ? (
+                <Welcome onWelcomeComplete={() => setShowWelcome(false)} />
+              ) : (
+                <NavigationContainer />
+              )}
             </SafeAreaProvider>
           </RealmProvider>
         </PersistGate>
diff --git a/src/screens/welcome.tsx b/src/screens/welcome.tsx
index 2cec998..84d3035 100644
--- a/src/screens/welcome.tsx
+++ b/src/screens/welcome.tsx
@@ -7,13 +7,14 @@ import styles from '../styles';
 import { noOp } from '../utilities';
 import { updateStorageUri } from '../state';
 
-const Welcome = () => {
+const Welcome = ({ onWelcomeComplete }: { onWelcomeComplete: () => void }) => {
   const dispatch = useDispatch();
 
   const selectStorageLocation = async () => {
     const uri = await openDocumentTree(true).catch(noOp);
     if (!uri) return;
     await dispatch(updateStorageUri(uri.uri));
+    onWelcomeComplete();
   };
 
   return (