diff --git a/.DS_Store b/.DS_Store
index 50b6c093..1ea62397 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml
index 8e4fe97e..abcad11b 100644
--- a/.gitea/workflows/test-flight-cd.yaml
+++ b/.gitea/workflows/test-flight-cd.yaml
@@ -1,5 +1,4 @@
-name: "Flutter Build & TestFlight Upload"
-
+name: "Build Test Flight"
 on:
   pull_request:
     branches:
@@ -9,29 +8,26 @@ jobs:
   build:
     runs-on: [macos-arm64]
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v2
 
-      - name: Install dependencies
-        run: flutter pub get
-
-      - name: Build iOS App
+      - name: Delete existing keychain if present
         run: |
-          flutter build ipa \
-            --release \
-            --no-codesign
+          if security list-keychains | grep -q "signing_temp.keychain"; then
+            security delete-keychain signing_temp.keychain
+          fi          
 
-      - name: Setup keychain and provisioning profiles
-        run: |
-          security create-keychain -p "" signing_temp.keychain
-          security default-keychain -s signing_temp.keychain
-          security unlock-keychain -p "" signing_temp.keychain
-          echo "${{ secrets.CERTIFICATES_FILE_BASE64 }}" | base64 --decode > certs.p12
-          security import certs.p12 -P "${{ secrets.CERTIFICATES_PASSWORD }}" -A
-          rm -f certs.p12
+      - name: Import code sign
+        uses: mso7nueh/import-codesign-certs@v1
+        env:
+          KEYCHAIN_PATH: ${{ runner.temp }}/signing_temp.keychain
+        with:
+          keychain-path: ${{ env.KEYCHAIN_PATH }}
+          p12-file-base64: ${{ secrets.CERTIFICATES_FILE_BASE64 }}
+          p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}
 
-      - name: Download provisioning profiles
-        uses: apple-actions/download-provisioning-profiles@v1
+      - name: Download provisioning
+        uses: mso7nueh/apple-provisioning-profiles-downloader@v1.0.8
         with:
           profile-type: IOS_APP_STORE
           bundle-id: com.eatvioapp.app
@@ -39,29 +35,12 @@ jobs:
           api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
           api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}
 
-      - name: Code signing
-        run: |
-          xcodebuild \
-            -workspace ios/Runner.xcworkspace \
-            -scheme Runner \
-            -archivePath build/Runner.xcarchive \
-            -sdk iphoneos \
-            -configuration Release \
-            clean archive \
-            CODE_SIGN_IDENTITY="iPhone Distribution" \
-            PROVISIONING_PROFILE_SPECIFIER="$(ls ~/Library/MobileDevice/Provisioning\ Profiles | head -n 1)"
-
-      - name: Export IPA
-        run: |
-          xcodebuild -exportArchive \
-            -archivePath build/Runner.xcarchive \
-            -exportPath build/ \
-            -exportOptionsPlist ios/exportOptions.plist
+      - run: ./Build-tf
 
       - name: Upload to TestFlight
-        uses: apple-actions/upload-testflight-build@v1
+        uses: mso7nueh/upload-testflight-build@master
         with:
-          app-path: build/EatvioApp.ipa
+          app-path: .build/Artifacts/EatvioApp.ipa/EatvioApp.ipa
           issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }}
           api-key-id: ${{ secrets.APPSTORE_KEY_ID }}
           api-private-key: ${{ secrets.APPSTORE_PRIVATE_KEY }}
\ No newline at end of file
diff --git a/Build-tf b/Build-tf
index 13c0fc98..c9fecb0a 100755
--- a/Build-tf
+++ b/Build-tf
@@ -33,6 +33,7 @@ flutter pub get
 cd ios
 rm -rf Pods Podfile.lock
 pod install --repo-update
+pod update
 cd ..
 
 rm -rf "${RESULT_BUNDLE_PATH}"
diff --git a/android/.DS_Store b/android/.DS_Store
new file mode 100644
index 00000000..8db9f5e0
Binary files /dev/null and b/android/.DS_Store differ