diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json
index 43c3dee0..a80e9315 100644
--- a/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json
+++ b/build-aux/flatpak/com.github.GradienceTeam.Gradience.Devel.json
@@ -54,37 +54,45 @@
                 }
             ]
         },
-        {
-            "name": "libsass",
-            "buildsystem": "simple",
-            "build-commands": [
-                "autoreconf --force --install",
-                "./configure --enable-shared --prefix=/app",
-                "make -j4",
-                "make install"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/sass/libsass.git",
-                    "tag": "3.6.5"
-                }
-            ]
-        },
         {
             "name": "sassc",
-            "buildsystem": "simple",
-            "build-commands": [
-                "autoreconf --force --install",
-                "./configure --prefix=/app",
-                "make -j4",
-                "make install"
-            ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/sass/sassc.git",
                     "tag": "3.6.2"
+                },
+                {
+                    "type": "script",
+                    "dest-filename": "autogen.sh",
+                    "commands": [
+                        "autoreconf -si"
+                    ]
+                }
+            ],
+            "cleanup": [
+                "*"
+            ],
+            "modules": [
+                {
+                    "name": "libsass",
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/sass/libsass.git",
+                            "tag": "3.6.5"
+                        },
+                        {
+                            "type": "script",
+                            "dest-filename": "autogen.sh",
+                            "commands": [
+                                "autoreconf -si"
+                            ]
+                        }
+                    ],
+                    "cleanup": [
+                        "*"
+                    ]
                 }
             ]
         },
@@ -118,8 +126,5 @@
                 }
             ]
         }
-    ],
-    "build-options" : {
-        "env" : {        }
-    }
+    ]
 }
diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
index 9aa6e51e..6796a6d1 100644
--- a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
+++ b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
@@ -50,41 +50,49 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
-                    "branch" : "v0.4.0"
-                }
-            ]
-        },
-        {
-            "name": "libsass",
-            "buildsystem": "simple",
-            "build-commands": [
-                "autoreconf --force --install",
-                "./configure --enable-shared --prefix=/app",
-                "make -j4",
-                "make install"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/sass/libsass.git",
-                    "tag": "3.6.5"
+                    "tag" : "v0.4.0"
                 }
             ]
         },
         {
             "name": "sassc",
-            "buildsystem": "simple",
-            "build-commands": [
-                "autoreconf --force --install",
-                "./configure --prefix=/app",
-                "make -j4",
-                "make install"
-            ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/sass/sassc.git",
                     "tag": "3.6.2"
+                },
+                {
+                    "type": "script",
+                    "dest-filename": "autogen.sh",
+                    "commands": [
+                        "autoreconf -si"
+                    ]
+                }
+            ],
+            "cleanup": [
+                "*"
+            ],
+            "modules": [
+                {
+                    "name": "libsass",
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/sass/libsass.git",
+                            "tag": "3.6.5"
+                        },
+                        {
+                            "type": "script",
+                            "dest-filename": "autogen.sh",
+                            "commands": [
+                                "autoreconf -si"
+                            ]
+                        }
+                    ],
+                    "cleanup": [
+                        "*"
+                    ]
                 }
             ]
         },
@@ -118,8 +126,5 @@
                 }
             ]
         }
-    ],
-    "build-options" : {
-        "env" : {        }
-    }
+    ]
 }