diff --git a/.github/Dockerfile b/.github/Dockerfile
index c67259b2..d63e500a 100644
--- a/.github/Dockerfile
+++ b/.github/Dockerfile
@@ -1,24 +1,9 @@
 ARG FLUTTER_VERSION
+
+FROM --platform=linux/arm64 krtirtho/flutter_distributor_arm64:${FLUTTER_VERSION}
+
 ARG BUILD_VERSION
 
-FROM --platform=linux/arm64 ubuntu:22.04
-
-RUN apt-get update && \
-  apt-get install -y bash curl file git unzip xz-utils zip libglu1-mesa cmake tar clang ninja-build pkg-config libgtk-3-dev make python3-pip python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse libunwind-dev locate patchelf gir1.2-appindicator3-0.1 libappindicator3-1 libappindicator3-dev libsecret-1-0 libjsoncpp25 libsecret-1-dev libjsoncpp-dev libnotify-bin libnotify-dev mpv libmpv-dev rpm &&\
-  rm -rf /var/lib/apt/lists/*
-
-WORKDIR /home/flutter
-
-RUN git clone https://github.com/flutter/flutter.git -b ${FLUTTER_VERSION} flutter-sdk
-
-RUN flutter-sdk/bin/flutter precache
-
-RUN flutter-sdk/bin/flutter config --no-analytics
-
-ENV PATH="$PATH:/home/flutter/flutter-sdk/bin"
-ENV PATH="$PATH:/home/flutter/flutter-sdk/bin/cache/dart-sdk/bin"
-ENV PATH="$PATH:/home/flutter/.pub-cache/bin"
-
 WORKDIR /app
 
 COPY . .
@@ -30,8 +15,7 @@ RUN flutter pub get &&\
   flutter pub get &&\
   dart run build_runner build --delete-conflicting-outputs
 
-RUN dart pub global activate flutter_distributor &&\
-  alias dpkg-deb="dpkg-deb --Zxz" &&\
+RUN alias dpkg-deb="dpkg-deb --Zxz" &&\
   flutter_distributor package --platform=linux --targets=deb &&\
   flutter_distributor package --platform=linux --targets=rpm
 
diff --git a/.github/Dockerfile.flutter_distributor b/.github/Dockerfile.flutter_distributor
new file mode 100644
index 00000000..da697c21
--- /dev/null
+++ b/.github/Dockerfile.flutter_distributor
@@ -0,0 +1,21 @@
+FROM --platform=linux/arm64 ubuntu:22.04
+
+ARG FLUTTER_VERSION
+
+RUN apt-get update && \
+  apt-get install -y bash curl file git unzip xz-utils zip libglu1-mesa cmake tar clang ninja-build pkg-config libgtk-3-dev make python3-pip python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse libunwind-dev locate patchelf gir1.2-appindicator3-0.1 libappindicator3-1 libappindicator3-dev libsecret-1-0 libjsoncpp25 libsecret-1-dev libjsoncpp-dev libnotify-bin libnotify-dev mpv libmpv-dev rpm &&\
+  rm -rf /var/lib/apt/lists/*
+
+WORKDIR /home/flutter
+
+RUN git clone https://github.com/flutter/flutter.git -b v${FLUTTER_VERSION} --single-branch flutter-sdk
+
+RUN flutter-sdk/bin/flutter precache
+
+RUN flutter-sdk/bin/flutter config --no-analytics
+
+ENV PATH="$PATH:/home/flutter/flutter-sdk/bin"
+ENV PATH="$PATH:/home/flutter/flutter-sdk/bin/cache/dart-sdk/bin"
+ENV PATH="$PATH:/home/flutter/.pub-cache/bin"
+
+RUN dart pub global activate flutter_distributor
\ No newline at end of file