diff --git a/.lighthouse/jenkins-x/devbranch.yaml b/.lighthouse/jenkins-x/devbranch.yaml
new file mode 100644
index 0000000..7596081
--- /dev/null
+++ b/.lighthouse/jenkins-x/devbranch.yaml
@@ -0,0 +1,55 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  creationTimestamp: null
+  name: devbranch
+spec:
+  pipelineSpec:
+    tasks:
+    - name: from-build-pack
+      resources: {}
+      taskSpec:
+        metadata: {}
+        stepTemplate:
+          env:
+          - name: NPM_CONFIG_USERCONFIG
+            value: /tekton/home/npm/.npmrc
+          image: uses:jenkins-x/jx3-pipeline-catalog/tasks/flutter/release.yaml@versionStream
+          name: ""
+          resources:
+            requests:
+              cpu: 400m
+              memory: 512Mi
+          volumeMounts:
+          - mountPath: /tekton/home/npm
+            name: npmrc
+          workingDir: /workspace/source
+        steps:
+        - image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone.yaml@versionStream
+          name: ""
+          resources: {}
+        - name: next-version
+          resources: {}
+        - name: jx-variables
+          resources: {}
+        - image: cirrusci/flutter:2.5.3
+          name: build
+          resources: {}
+          script: |
+            #!/usr/bin/bash
+            flutter clean
+            flutter pub upgrade
+            flutter doctor -v
+            flutter pub get
+            flutter build apk
+        - name: promote-release
+          resources: {}
+        volumes:
+        - name: npmrc
+          secret:
+            optional: true
+            secretName: npmrc
+  podTemplate: {}
+  serviceAccountName: tekton-bot
+  timeout: 12h0m0s
+status: {}
diff --git a/.lighthouse/jenkins-x/pullrequest.yaml b/.lighthouse/jenkins-x/pullrequest.yaml
index edcdf13..adaa6e6 100644
--- a/.lighthouse/jenkins-x/pullrequest.yaml
+++ b/.lighthouse/jenkins-x/pullrequest.yaml
@@ -24,8 +24,16 @@ spec:
           resources: {}
         - name: jx-variables
           resources: {}
-        - name: build
+        - image: cirrusci/flutter:2.5.3
+          name: build
           resources: {}
+          script: |
+            #!/usr/bin/bash
+            flutter clean
+            flutter pub upgrade
+            flutter doctor -v
+            flutter pub get
+            flutter build apk
   podTemplate: {}
   serviceAccountName: tekton-bot
   timeout: 12h0m0s
diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml
index 8f5dd39..c4b9214 100644
--- a/.lighthouse/jenkins-x/release.yaml
+++ b/.lighthouse/jenkins-x/release.yaml
@@ -32,8 +32,16 @@ spec:
           resources: {}
         - name: jx-variables
           resources: {}
-        - name: build
+        - image: cirrusci/flutter:2.5.3
+          name: build
           resources: {}
+          script: |
+            #!/usr/bin/bash
+            flutter clean
+            flutter pub upgrade
+            flutter doctor -v
+            flutter pub get
+            flutter build apk
         - name: promote-release
           resources: {}
         volumes:
diff --git a/.lighthouse/jenkins-x/triggers.yaml b/.lighthouse/jenkins-x/triggers.yaml
index ae2fcfa..5acbf39 100644
--- a/.lighthouse/jenkins-x/triggers.yaml
+++ b/.lighthouse/jenkins-x/triggers.yaml
@@ -7,10 +7,18 @@ spec:
     always_run: true
     optional: false
     source: "pullrequest.yaml"
+    ignore_changes: "OWNERS"
   postsubmits:
+  - name: devbranch
+    context: "devbranch"
+    source: "devbranch.yaml"
+    ignore_changes: "OWNERS"
+    branches:
+    - ^dev$
   - name: release
     context: "release"
     source: "release.yaml"
+    ignore_changes: "OWNERS"
     branches:
     - ^main$
     - ^master$
diff --git a/OWNERS b/OWNERS
index 3b98152..1f3811a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,13 @@
 approvers:
+- Veleslavskiy
+- MarynaShevchuk
 - niazhussain
+- dorloechter
+- faisalthaheem
+- kosswest
 reviewers:
-- niazhussain
+- faisalthaheem
+- irediaes
+- johnotu
+- NotSoFancyName
+- sfffaaa
\ No newline at end of file
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
deleted file mode 100644
index e688dfb..0000000
--- a/OWNERS_ALIASES
+++ /dev/null
@@ -1,6 +0,0 @@
-aliases:
-- niazhussain
-best-approvers:
-- niazhussain
-best-reviewers:
-- niazhussain
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 46711af..fbf4ebc 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "network.peaq.charmev"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/pubspec.lock b/pubspec.lock
index 2244323..82f2567 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -105,7 +105,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -379,7 +379,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -673,7 +680,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description:
@@ -694,7 +701,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   watcher:
     dependency: transitive
     description: