diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 33e7cf8d..80825645 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -16,6 +16,20 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Create key.properties file
+        run: |
+          cat > android/key.properties <<EOF
+          storePassword=${{ vars.SIGNING_STORE_PASSWORD }}
+          keyPassword=${{ vars.SIGNING_KEY_PASSWORD }}
+          keyAlias=${{ vars.SIGNING_KEY_ALIAS }}
+          storeFile=upload-keystore.jks
+          EOF
+
+      - name: Decode keystore from secret
+        run: |
+          echo "${{ vars.SIGNING_KEY_JKS }}"
+          printf "%s" "${{ vars.SIGNING_KEY_JKS }}" | base64 -d > android/app/upload-keystore.jks
+
       - name: Cache Android SDK
         id: cache-sdk
         uses: "https://gitea.com/actions/cache@v4"
@@ -104,19 +118,6 @@ jobs:
       - name: Test
         run: flutter test
 
-      - name: Create key.properties file
-        run: |
-          cat > android/key.properties <<EOF
-          storePassword=${{ secrets.SIGNING_STORE_PASSWORD }}
-          keyPassword=${{ secrets.SIGNING_KEY_PASSWORD }}
-          keyAlias=${{ secrets.SIGNING_KEY_ALIAS }}
-          storeFile=my-release-key.jks
-          EOF
-
-      - name: Decode keystore from secret
-        run: |
-          printf "%s" "${{ secrets.SIGNING_KEY_JKS }}" | base64 -d > android/app/my-release-key.jks
-
       - name: Build apk
         run: flutter build apk --release
 
diff --git a/lib/features/update_screen/presentation/update_screen.dart b/lib/features/update_screen/presentation/update_screen.dart
index d516d863..99e9e880 100644
--- a/lib/features/update_screen/presentation/update_screen.dart
+++ b/lib/features/update_screen/presentation/update_screen.dart
@@ -25,8 +25,8 @@ class UpdateScreen extends StatelessWidget {
               fit: BoxFit.cover,
             ),
           ),
-          SafeArea(
-            child: Positioned.fill(
+          Positioned.fill(
+            child: SafeArea(
               child: Padding(
                 padding: const EdgeInsets.only(bottom: 16),
                 child: Column(
diff --git a/lib/features/welcome/presentation/pages/welcome_screen.dart b/lib/features/welcome/presentation/pages/welcome_screen.dart
index 0ae017a1..b36e9233 100644
--- a/lib/features/welcome/presentation/pages/welcome_screen.dart
+++ b/lib/features/welcome/presentation/pages/welcome_screen.dart
@@ -37,8 +37,8 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
               fit: BoxFit.cover,
             ),
           ),
-          SafeArea(
-            child: Positioned.fill(
+          Positioned.fill(
+            child: SafeArea(
               child: Padding(
                 padding: const EdgeInsets.only(bottom: 16),
                 child: Column(