diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ed20246..46adc074 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,17 +16,15 @@ jobs:
         uses: actions/setup-java@v1
         with: {java-version: 1.8}
 
-      - name: Run tests, assemble APK and AAB
-        id: run_tests_assemble_apk_aab
+      - name: Assemble APK and Bundle
         run: |
           chmod +x ./gradlew
-          ./gradlew test
           ./gradlew assembleRelease
           ./gradlew bundleRelease
 
-      - name: Sign release apk
+      - name: Sign APK
         uses: r0adkll/sign-android-release@v1
-        id: sign_release_apk
+        id: sign_apk
         with:
           releaseDirectory: app/build/outputs/apk/release
           signingKeyBase64: ${{ secrets.KEY_STORE }}
@@ -36,9 +34,9 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: "30.0.3"
 
-      - name: Sign release bundle
+      - name: Sign Bundle
         uses: r0adkll/sign-android-release@v1
-        id: sign_release_bundle
+        id: sign_bundle
         with:
           releaseDirectory: app/build/outputs/bundle/release
           signingKeyBase64: ${{ secrets.KEY_STORE }}
@@ -48,20 +46,18 @@ jobs:
         env:
           BUILD_TOOLS_VERSION: "30.0.3"
 
-      - name: Deploy AAB to Play Store
+      - name: Deploy Bundle to Play Store
         uses: r0adkll/upload-google-play@v1
-        id: deploy_bundle_to_production
         with:
           serviceAccountJsonPlainText: ${{secrets.SERVICE_ACCOUNT_JSON}}
           packageName: com.rtbishop.look4sat
           track: production
           whatsNewDirectory: fastlane/metadata/android/en-US/whatsnew
-          releaseFiles: ${{steps.sign_release_bundle.outputs.signedReleaseFile}}
+          releaseFiles: ${{steps.sign_bundle.outputs.signedReleaseFile}}
 
-      - name: Upload files to action
-        uses: actions/upload-artifact@v2
+      - name: Create release
+        uses: ncipollo/release-action@v1
         with:
-          name: Look4Sat_files
-          path: |
-            ${{steps.sign_release_apk.outputs.signedReleaseFile}}
-            ${{steps.sign_release_bundle.outputs.signedReleaseFile}}
\ No newline at end of file
+          artifact: ${{steps.sign_apk.outputs.signedReleaseFile}}
+          bodyFile: fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US
+          token: ${{ secrets.RELEASE_TOKEN }}
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1..956c004d 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
 /build
+/release
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a6b781c2..186935cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,11 @@ android {
         targetSdkVersion 30
         versionCode 222
         versionName "2.2.2"
-        setProperty("archivesBaseName", "look4sat" + "-v" + versionName)
+        kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }
     }
 
     buildTypes {
diff --git a/app/schemas/com.rtbishop.look4sat.repository.localData.SatelliteDb/2.json b/app/schemas/com.rtbishop.look4sat.repository.localData.SatelliteDb/2.json
new file mode 100644
index 00000000..0387840a
--- /dev/null
+++ b/app/schemas/com.rtbishop.look4sat.repository.localData.SatelliteDb/2.json
@@ -0,0 +1,126 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 2,
+    "identityHash": "ae51481b0cb1f66d055cd7487e79ad2c",
+    "entities": [
+      {
+        "tableName": "entries",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tle` TEXT NOT NULL, `isSelected` INTEGER NOT NULL, `catNum` INTEGER NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`catNum`))",
+        "fields": [
+          {
+            "fieldPath": "tle",
+            "columnName": "tle",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isSelected",
+            "columnName": "isSelected",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "catNum",
+            "columnName": "catNum",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "catNum"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "transmitters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uuid` TEXT NOT NULL, `description` TEXT NOT NULL, `isAlive` INTEGER NOT NULL, `uplinkLow` INTEGER, `uplinkHigh` INTEGER, `downlinkLow` INTEGER, `downlinkHigh` INTEGER, `mode` TEXT, `isInverted` INTEGER NOT NULL, `catNum` INTEGER NOT NULL, PRIMARY KEY(`uuid`))",
+        "fields": [
+          {
+            "fieldPath": "uuid",
+            "columnName": "uuid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAlive",
+            "columnName": "isAlive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uplinkLow",
+            "columnName": "uplinkLow",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "uplinkHigh",
+            "columnName": "uplinkHigh",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downlinkLow",
+            "columnName": "downlinkLow",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "downlinkHigh",
+            "columnName": "downlinkHigh",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mode",
+            "columnName": "mode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isInverted",
+            "columnName": "isInverted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "catNum",
+            "columnName": "catNum",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "uuid"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ae51481b0cb1f66d055cd7487e79ad2c')"
+    ]
+  }
+}
\ No newline at end of file