diff --git a/eigen.json b/eigen.json
new file mode 100644
index 0000000..cbd1bbc
--- /dev/null
+++ b/eigen.json
@@ -0,0 +1,12 @@
+{
+    "name": "eigen",
+    "buildsystem": "cmake-ninja",
+    "builddir": true,
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2",
+            "sha256": "a4143fc45e4454b4b98fcea3516b3a79b8cdb3bc7fadf996d088c6a0d805fea1"
+        }
+    ]
+}
diff --git a/org.kde.krita.json b/org.kde.krita.json
index f7a66cf..5f8c71b 100644
--- a/org.kde.krita.json
+++ b/org.kde.krita.json
@@ -1,45 +1,34 @@
 {
     "id": "org.kde.krita",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "master",
     "sdk": "org.kde.Sdk",
     "command": "krita",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--env=QT_QPA_PLATFORM=flatpak" ],
 
     "modules": [
         "boost.json",
-        {
-            "name": "eigen",
-            "buildsystem": "cmake-ninja",
-            "builddir": true,
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2",
-                    "sha256": "a4143fc45e4454b4b98fcea3516b3a79b8cdb3bc7fadf996d088c6a0d805fea1"
-                }
-            ]
-        },
+        "eigen.json",
         {
             "name": "exiv2",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.exiv2.org/exiv2-0.25.tar.gz",
                     "sha256": "c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4"
                 }
             ]
         },
         {
             "name": "krita",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/krita.git", "branch": "krita/3.1" } ]
         }
     ]
 }
diff --git a/org.kde.kstars.json b/org.kde.kstars.json
index 57de715..090fe1f 100644
--- a/org.kde.kstars.json
+++ b/org.kde.kstars.json
@@ -1,31 +1,20 @@
 {
     "id": "org.kde.kstars",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "master",
     "sdk": "org.kde.Sdk",
     "command": "kstars",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--env=QT_QPA_PLATFORM=flatpak" ],
 
     "modules": [
-        {
-            "name": "eigen",
-            "buildsystem": "cmake",
-            "builddir": true,
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "http://bitbucket.org/eigen/eigen/get/3.2.8.tar.bz2",
-                    "sha256": "722a63d672b70f39c271c5e2a4a43ba14d12015674331790414fcb167c357e55"
-                }
-            ]
-        },
+        "eigen.json",
         {
             "name": "kstars",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kstars.git" } ]
         }
     ]
 }
diff --git a/org.kde.step.json b/org.kde.step.json
index daaf2b4..402ecd5 100644
--- a/org.kde.step.json
+++ b/org.kde.step.json
@@ -1,49 +1,38 @@
 {
     "id": "org.kde.step",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "master",
     "sdk": "org.kde.Sdk",
     "command": "step",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--env=QT_QPA_PLATFORM=flatpak" ],
 
     "modules": [
+        "eigen.json",
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.30.0" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.30.0" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.30.0" } ]
         },
-        {
-            "name": "eigen",
-            "buildsystem": "cmake-ninja",
-            "builddir": true,
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "http://bitbucket.org/eigen/eigen/get/3.2.8.tar.bz2",
-                    "sha256": "722a63d672b70f39c271c5e2a4a43ba14d12015674331790414fcb167c357e55"
-                }
-            ]
-        },
         {
             "name": "step",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/step.git" } ]
         }
     ]
 }