diff --git a/.github/workflows/build-ci-image.yaml b/.github/workflows/build-ci-image.yaml
index ad4451bcc..4c40a0873 100644
--- a/.github/workflows/build-ci-image.yaml
+++ b/.github/workflows/build-ci-image.yaml
@@ -2,14 +2,14 @@ name: Build CI image
 
 on:
   push:
-    branches: [main]
+    branches: [main, staging]
     paths:
       - 'Dockerfile'
       - '.github/workflows/build-ci-image.yaml'
   workflow_dispatch:
 
 env:
-  IMAGE: YOUR_DOCKERHUB_USERNAME/stack-wallet-ci
+  IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/stackwallet-ci
 
 jobs:
   build:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ba518c190..bd1aedac0 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,9 +1,13 @@
-#should deny
 name: Test
 on: [pull_request]
 jobs:
   test:
     runs-on: ubuntu-24.04
+    container:
+      image: stackwallet/stackwallet-ci:latest
+      credentials:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     steps:
       - name: Prepare repository
         uses: actions/checkout@v6
@@ -11,24 +15,6 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - name: Install Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: '3.38.1'
-          channel: 'stable'
-
-      - name: install dependencies
-        run: |
-          cargo install cargo-ndk
-          rustup install 1.85.1 1.89.0
-          rustup target add x86_64-unknown-linux-gnu --toolchain 1.89.0
-          sudo apt update
-          sudo apt install -y meson ninja-build libglib2.0-dev libgcrypt20-dev libgirepository1.0-dev unzip automake build-essential file pkg-config git python3 libtool cmake openjdk-8-jre-headless libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm debhelper libclang-dev opencl-headers libssl-dev ocl-icd-opencl-dev libc6-dev-i386 valac libtss2-dev
-          #      - name: Build Epic Cash
-          #run: |
-          #cd crypto_plugins/flutter_libepiccash/scripts/linux/
-          #./build_all.sh
-
       - name: Configure app
         run: |
           cd scripts
diff --git a/Dockerfile b/Dockerfile
index 3f501e85c..5353914a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
       build-essential automake cmake meson ninja-build pkg-config libtool \
       libglib2.0-dev libgtk-3-dev liblzma-dev \
       libgcrypt20-dev libgirepository1.0-dev \
-      openjdk-8-jre-headless libgit2-dev clang \
+      libgit2-dev clang rsync \
       libncurses5-dev libncursesw5-dev zlib1g-dev llvm debhelper \
       libclang-dev opencl-headers libssl-dev ocl-icd-opencl-dev \
-      libc6-dev-i386 valac libtss2-dev \
+      valac libtss2-dev libsecret-1-dev libjsoncpp-dev \
  && rm -rf /var/lib/apt/lists/*
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -43,4 +43,6 @@ RUN git clone --depth 1 --branch 3.38.1 https://github.com/flutter/flutter.git "
  && flutter precache --linux \
  && chmod -R a+rwX "$FLUTTER_HOME"
 
+RUN git config --system --add safe.directory '*'
+
 RUN flutter --version && rustc --version && cargo --version && node --version