diff --git a/CHANGELOG.md b/CHANGELOG.md
index 148fa068a..bbde1ff9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 - [#2644] Debugger - Button to sort variables alphabetically
 - AS3 Direct editation - Error when accessing inaccessible namespace
 - AS3 ambiguous namespace detection (back again)
+- [#2648] Dockerfile
 
 ### Fixed
 - [#2643] APNG export - images containing multiple IDAT chunks
@@ -4180,6 +4181,7 @@ Major version of SWF to XML export changed to 2.
 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8
 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7
 [#2644]: https://www.free-decompiler.com/flash/issues/2644
+[#2648]: https://www.free-decompiler.com/flash/issues/2648
 [#2643]: https://www.free-decompiler.com/flash/issues/2643
 [#2645]: https://www.free-decompiler.com/flash/issues/2645
 [#2514]: https://www.free-decompiler.com/flash/issues/2514
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..9c1606aa8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+# Based on Dockerfile by Mahdi Lazraq
+
+FROM eclipse-temurin:21-jre
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    unzip \
+    xvfb \
+    libxrender1 \
+    libxtst6 \
+    libxi6 \
+    && rm -rf /var/lib/apt/lists/*
+
+ADD https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version25.1.2/ffdec_25.1.2.zip /opt/ffdec.zip
+RUN cd /opt && unzip ffdec.zip -d ffdec && rm ffdec.zip
+
+WORKDIR /work
+
+ENTRYPOINT ["java", "-jar", "/opt/ffdec/ffdec.jar"]
+
diff --git a/README.md b/README.md
index c566317cf..f4ec9a9e1 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,19 @@ There are few libraries which need to be built too. These libraries are placed i
 * **ttf** - used for TTF font export (Netbeans/Ant project)
 * **gnujpdf** - used for PDF export (Netbeans/Ant project)
 
+## Docker
+We have `Dockerfile` for headless running for not needing to install Java or FFDec locally.
+(Original script by Mahdi Lazraq)
+### Build
+```
+docker build -t ffdec .
+```
+### Usage
+FFDec CLI is the entrypoint, so you can pass arguments directly:
+```
+docker run --rm -v ./input:/work/input -v ./output:/work/output ffdec [args]
+```
+
 ## Change log
 All notable changes are listed in the file [CHANGELOG.md](CHANGELOG.md)
 
diff --git a/build.xml b/build.xml
index 4ad4f1efd..cefe56af2 100644
--- a/build.xml
+++ b/build.xml
@@ -946,12 +946,17 @@
     <target name="build_cli">
         <ant antfile="${cli.script}" target="build" inheritAll="false" usenativebasedir="true"/>
     </target>
+   
+    <target name="update-dockefile" depends="-github-newversion-input">
+        <replaceregexp file="Dockerfile" match="version[^/]+/ffdec_[^/]+.zip" replace="version${gh.newversion}/ffdec_${gh.newversion}.zip"/>
+    </target>   
     
-    <target name="github-newversion" depends="-git-required,-git-checkout-master,-github-newversion-input,rename-unreleased-section,update-changelog-md,update-metainfo">
+    <target name="github-newversion" depends="-git-required,-git-checkout-master,-github-newversion-input,rename-unreleased-section,update-changelog-md,update-metainfo,update-dockefile">
         <exec executable="git" failonerror="true">
             <arg value="add"/>
             <arg value="${changelog.file}"/>            
             <arg value="${metainfo.file}"/>   
+            <arg value="Dockerfile"/>
         </exec> 
         
         <exec executable="git" failonerror="true">